Merge pull request #5 from alextd/master

Fix conflict with ReplaceStuff
AndroidQuazar · Apr 12, 2021 · 61e4b7c · 61e4b7c
2 parents 590c233 + 06d2689
commit 61e4b7c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/1.2/Assemblies/VanillaPowerExpanded.dll b/1.2/Assemblies/VanillaPowerExpanded.dll
diff --git a/1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/GasNet/PlaceWorkers/PlaceWorker_Pipe.cs b/1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/GasNet/PlaceWorkers/PlaceWorker_Pipe.cs
@@ -2,6 +2,7 @@
 // Copyright Karel Kroeze, 2020-2020
 
 using Verse;
+using System.Linq;
 
 namespace GasNetwork
 {
@@ -11,7 +12,7 @@ public override AcceptanceReport AllowsPlacing( BuildableDef checkingDef, IntVec
                                                         Thing thing = null )
         {
             // don't allow building pipes on top of piped buildings (blueprints)
-            return !loc.GetThingList( map ).Any( t => t.def.BuildingFrameOrBlueprintEverTransmitsGas() );
+            return !loc.GetThingList( map ).Where(t => t != thingToIgnore).Any( t => t.def.BuildingFrameOrBlueprintEverTransmitsGas() );
         }
     }
 }
diff --git a/1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/obj/Release/VanillaPowerExpanded.dll b/1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/obj/Release/VanillaPowerExpanded.dll