Merge branch 'master' of https://github.com/CovertJaguar/Railcraft

Railcraft · Sep 22, 2015 · 6502d9e · 6502d9e
2 parents 8987784 + 65af632
commit 6502d9e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/mods/railcraft/common/blocks/detector/types/DetectorAnimal.java b/src/main/java/mods/railcraft/common/blocks/detector/types/DetectorAnimal.java
@@ -50,8 +50,8 @@ public int testCarts(List<EntityMinecart> carts) {
                 if (chicken) {
                     return FULL_POWER;
                 }
-            } else if (cart.riddenByEntity instanceof EntityCow) {
-                if (cow) {
+            } else if (cart.riddenByEntity instanceof EntityMooshroom) {
+                if (mooshroom) {
                     return FULL_POWER;
                 }
             } else if (cart.riddenByEntity instanceof EntityPig) {
@@ -62,8 +62,8 @@ public int testCarts(List<EntityMinecart> carts) {
                 if (sheep) {
                     return FULL_POWER;
                 }
-            } else if (cart.riddenByEntity instanceof EntityMooshroom) {
-                if (mooshroom) {
+            } else if (cart.riddenByEntity instanceof EntityCow) {
+                if (cow) {
                     return FULL_POWER;
                 }
             } else if (cart.riddenByEntity instanceof EntityWolf) {

diff --git a/src/main/java/mods/railcraft/common/worldgen/ComponentWorkshop.java b/src/main/java/mods/railcraft/common/worldgen/ComponentWorkshop.java
@@ -180,6 +180,21 @@ public boolean addComponentParts(World world, Random random, StructureBoundingBo
             if (EnumMachineBeta.ENGINE_STEAM_HOBBY.isAvaliable() && RailcraftConfig.machinesRequirePower())
                 placeEngine(world, 9, 1, 6, sbb);
         }
+
+
+        // foundation
+        for (int k = 0; k < 11; ++k) {
+			for (int l = 4; l < 11; ++l) {
+				this.clearCurrentPositionBlocksUpwards(world, l, 6, k, sbb);
+				this.func_151554_b(world, Blocks.cobblestone, 0, l, -1, k, sbb);
+			}
+		}
+        for (int k = 1; k < 6; ++k) {
+			for (int l = 0; l < 4; ++l) {
+				this.clearCurrentPositionBlocksUpwards(world, l, 6, k, sbb);
+				this.func_151554_b(world, Blocks.cobblestone, 0, l, -1, k, sbb);
+			}
+		}
 
         placeChest(world, 9, 1, 4, 3, random, sbb);