From 61f260d5704920bcccc81697511e86a7a7036fba Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Apr 2016 17:27:09 -0400 Subject: [PATCH] Prevent Fire from loading chunks This causes the nether to spam unload/reload chunks, plus overall bad behavior. diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java index 2909f78f87..d32857c872 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -78,7 +78,7 @@ public class BlockFire extends Block { BlockStateBoolean blockstateboolean = (BlockStateBoolean) BlockFire.g.get(enumdirection); if (blockstateboolean != null) { - iblockdata1 = (IBlockData) iblockdata1.set(blockstateboolean, this.h(iblockaccess.getType(blockposition.shift(enumdirection)))); + iblockdata1 = (IBlockData) iblockdata1.set(blockstateboolean, this.h(iblockaccess.getTypeIfLoaded(blockposition.shift(enumdirection)))); // Paper - prevent chunk loads } } @@ -163,6 +163,7 @@ public class BlockFire extends Block { } blockposition_mutableblockposition.g(blockposition).e(l, j1, i1); + if (!worldserver.isLoaded(blockposition_mutableblockposition)) continue; // Paper int l1 = this.a((IWorldReader) worldserver, (BlockPosition) blockposition_mutableblockposition); if (l1 > 0) { @@ -208,10 +209,16 @@ public class BlockFire extends Block { } private void a(World world, BlockPosition blockposition, int i, Random random, int j, BlockPosition sourceposition) { // CraftBukkit add sourceposition - int k = this.i(world.getType(blockposition)); + // Paper start + final IBlockData iblockdata = world.getTypeIfLoaded(blockposition); + if (iblockdata == null) { + return; + } + int k = this.i(iblockdata); + // Paper end if (random.nextInt(i) < k) { - IBlockData iblockdata = world.getType(blockposition); + //IBlockData iblockdata = world.getType(blockposition); // Paper // CraftBukkit start org.bukkit.block.Block theBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); @@ -251,7 +258,7 @@ public class BlockFire extends Block { for (int j = 0; j < i; ++j) { EnumDirection enumdirection = aenumdirection[j]; - if (this.h(iblockaccess.getType(blockposition.shift(enumdirection)))) { + if (this.h(iblockaccess.getTypeIfLoaded(blockposition.shift(enumdirection)))) { // Paper - prevent chunk loads return true; } } @@ -269,8 +276,12 @@ public class BlockFire extends Block { for (int k = 0; k < j; ++k) { EnumDirection enumdirection = aenumdirection[k]; - IBlockData iblockdata = iworldreader.getType(blockposition.shift(enumdirection)); - + // Paper start + IBlockData iblockdata = iworldreader.getTypeIfLoaded(blockposition.shift(enumdirection)); + if (iblockdata == null) { + continue; + } + // Paper end i = Math.max(this.r(iblockdata), i); } @@ -279,7 +290,7 @@ public class BlockFire extends Block { } public boolean h(IBlockData iblockdata) { - return this.r(iblockdata) > 0; + return iblockdata != null && this.r(iblockdata) > 0; // Paper - iblockdata can be nullable if chunk is unloaded now } @Override -- 2.26.2