From 4cd80238528284059c15b9877fb540eec893c3ed Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 26 Dec 2014 21:29:47 +0000 Subject: [PATCH] SPIGOT-276: Force load chunks in Location2D fixes /spreadplayers --- nms-patches/Location2D.patch | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 nms-patches/Location2D.patch diff --git a/nms-patches/Location2D.patch b/nms-patches/Location2D.patch new file mode 100644 index 0000000000..4214968723 --- /dev/null +++ b/nms-patches/Location2D.patch @@ -0,0 +1,32 @@ +--- ../work/decompile-8eb82bde//net/minecraft/server/Location2D.java 2014-12-26 21:29:07.829484981 +0000 ++++ src/main/java/net/minecraft/server/Location2D.java 2014-12-26 21:29:07.829484981 +0000 +@@ -68,7 +68,7 @@ + } + + blockposition = blockposition.down(); +- } while (world.getType(blockposition).getBlock().getMaterial() == Material.AIR); ++ } while (getType(world, blockposition).getBlock().getMaterial() == Material.AIR); // CraftBukkit + + return blockposition.getY() + 1; + } +@@ -84,7 +84,7 @@ + } + + blockposition = blockposition.down(); +- material = world.getType(blockposition).getBlock().getMaterial(); ++ material = getType(world, blockposition).getBlock().getMaterial(); // CraftBukkit + } while (material == Material.AIR); + + return !material.isLiquid() && material != Material.FIRE; +@@ -94,4 +94,11 @@ + this.a = MathHelper.a(random, d0, d2); + this.b = MathHelper.a(random, d1, d3); + } ++ ++ // CraftBukkit start - add a version of getType which force loads chunks ++ private static IBlockData getType(World world, BlockPosition position) { ++ ((ChunkProviderServer) world.chunkProvider).getChunkAt(position.getX() >> 4, position.getZ() >> 4); ++ return world.getType(position); ++ } ++ // CraftBukkit end + }