Merge pull request Thaumic-Tinkerer#876 from Kamesuta/1.7-final

Infinite loop problem from Bedrock Dimension in SkyBlock.
SarahKirksey · Jul 24, 2017 · 3388dd2 · 3388dd2
2 parents 34aee42 + 7455dae
commit 3388dd2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/thaumic/tinkerer/common/block/kami/BlockBedrockPortal.java b/src/main/java/thaumic/tinkerer/common/block/kami/BlockBedrockPortal.java
@@ -152,6 +152,12 @@ public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int p
 
                 while (entity.worldObj.getBlock(x, y, z) == Blocks.air || entity.worldObj.getBlock(x, y, z).isAir(par1World, x, y, z)) {
                     y--;
+                    // Avoid infinite loop.
+                    if (y <= 1) {
+                        y = 120;
+                        // Set up the scaffolding.
+                        entity.worldObj.setBlock(x, y - 1, z, Blocks.stone);
+                    }
                 }
 
                 ((EntityPlayerMP) entity).playerNetServerHandler.setPlayerLocation(x + 0.5, y + 3, z + 0.5, 0, 0);