From d8a9c7be4227b2243968b63ab7cc7a00098c93ad Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Thu, 26 Feb 2015 22:41:06 +0000
Subject: Update to Minecraft 1.8.3

---
 nms-patches/BlockFire.patch | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'nms-patches/BlockFire.patch')

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 {
-- 
cgit v1.2.3