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/BlockFire.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/BlockFire.patch')
| -rw-r--r-- | nms-patches/BlockFire.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/nms-patches/BlockFire.patch b/nms-patches/BlockFire.patch index f02af723..02e3de44 100644 --- a/nms-patches/BlockFire.patch +++ b/nms-patches/BlockFire.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/BlockFire.java 2015-02-17 14:05:03.475599681 +0000 -+++ src/main/java/net/minecraft/server/BlockFire.java 2015-02-17 14:05:03.475599681 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/BlockFire.java 2015-02-26 22:40:22.123608144 +0000 ++++ src/main/java/net/minecraft/server/BlockFire.java 2015-02-26 22:40:22.123608144 +0000 @@ -4,6 +4,12 @@ import java.util.Map; import java.util.Random; @@ -25,7 +25,7 @@ @@ -120,7 +126,7 @@ } - if (!flag && world.S() && this.d(world, blockposition)) { + if (!flag && world.S() && this.e(world, blockposition)) { - world.setAir(blockposition); + fireExtinguished(world, blockposition); // CraftBukkit - extinguished by rain } else { @@ -33,7 +33,7 @@ @@ -133,14 +139,14 @@ if (!flag) { - if (!this.e(world, blockposition)) { + if (!this.f(world, blockposition)) { if (!World.a((IBlockAccess) world, blockposition.down()) || i > 3) { - world.setAir(blockposition); + fireExtinguished(world, blockposition); // CraftBukkit @@ -76,11 +76,10 @@ } } } -@@ -223,6 +248,17 @@ - +@@ -224,6 +249,17 @@ if (random.nextInt(i) < k) { IBlockData iblockdata = world.getType(blockposition); -+ + + // CraftBukkit start + org.bukkit.block.Block theBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); + @@ -91,9 +90,10 @@ + return; + } + // CraftBukkit end - ++ if (random.nextInt(j + 10) < 5 && !world.isRainingAt(blockposition)) { int l = j + random.nextInt(5) / 4; + @@ -233,7 +269,7 @@ world.setTypeAndData(blockposition, this.getBlockData().set(BlockFire.AGE, Integer.valueOf(l)), 3); @@ -106,7 +106,7 @@ @@ -290,7 +326,7 @@ public void doPhysics(World world, BlockPosition blockposition, IBlockData iblockdata, Block block) { - if (!World.a((IBlockAccess) world, blockposition.down()) && !this.e(world, blockposition)) { + if (!World.a((IBlockAccess) world, blockposition.down()) && !this.f(world, blockposition)) { - world.setAir(blockposition); + fireExtinguished(world, blockposition); // CraftBukkit - fuel block gone } @@ -114,8 +114,8 @@ } @@ -298,7 +334,7 @@ public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) { - if (world.worldProvider.getDimension() > 0 || !Blocks.PORTAL.d(world, blockposition)) { - if (!World.a((IBlockAccess) world, blockposition.down()) && !this.e(world, blockposition)) { + if (world.worldProvider.getDimension() > 0 || !Blocks.PORTAL.e(world, blockposition)) { + if (!World.a((IBlockAccess) world, blockposition.down()) && !this.f(world, blockposition)) { - world.setAir(blockposition); + fireExtinguished(world, blockposition); // CraftBukkit - fuel block broke } else { |