diff options
author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-26 22:41:06 +0000 |
---|---|---|
committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-04 09:48:58 +0000 |
commit | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch) | |
tree | 554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/Location2D.patch | |
parent | 33d5de312e9fcc8aec3fc53136658cb6920562aa (diff) | |
download | craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip |
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/Location2D.patch')
-rw-r--r-- | nms-patches/Location2D.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/nms-patches/Location2D.patch b/nms-patches/Location2D.patch deleted file mode 100644 index 42149687..00000000 --- a/nms-patches/Location2D.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ../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 - } |