summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/Location2D.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/nms-patches/Location2D.patch b/nms-patches/Location2D.patch
new file mode 100644
index 00000000..42149687
--- /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
+ }