From 0aaf5eb95ccee47170d2faa3f5693766d18adcb5 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 11 Jun 2016 22:22:27 -0500
Subject: [PATCH] Update upstream B/CB

---
 ...an-ISE-in-MagmaBlock-damage-handling.patch | 27 -------------------
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 Spigot-Server-Patches/Resolve-an-ISE-in-MagmaBlock-damage-handling.patch

diff --git a/Spigot-Server-Patches/Resolve-an-ISE-in-MagmaBlock-damage-handling.patch b/Spigot-Server-Patches/Resolve-an-ISE-in-MagmaBlock-damage-handling.patch
deleted file mode 100644
index c264f8b808..0000000000
--- a/Spigot-Server-Patches/Resolve-an-ISE-in-MagmaBlock-damage-handling.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Sat, 11 Jun 2016 19:09:16 -0500
-Subject: [PATCH] Resolve an ISE in MagmaBlock damage handling
-
-
-diff --git a/src/main/java/net/minecraft/server/BlockMagma.java b/src/main/java/net/minecraft/server/BlockMagma.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/BlockMagma.java
-+++ b/src/main/java/net/minecraft/server/BlockMagma.java
-@@ -0,0 +0,0 @@ public class BlockMagma extends Block {
- 
-     public void stepOn(World world, BlockPosition blockposition, Entity entity) {
-         if (!entity.isFireProof() && entity instanceof EntityLiving && !EnchantmentManager.j((EntityLiving) entity)) {
-+            final org.bukkit.block.Block oldBlockDamage = org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage; // Paper
-             org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit
-+            // Paper start
-+            try {
-             entity.damageEntity(DamageSource.HOT_FLOOR, 1.0F);
-+            } finally {
-+                org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = oldBlockDamage;
-+            }
-+            // Paper end
-         }
- 
-         super.stepOn(world, blockposition, entity);
---
\ No newline at end of file
diff --git a/work/Bukkit b/work/Bukkit
index a4fe2264e6..82821325a6 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit a4fe2264e678cdc646098df61398ea8a10b0731a
+Subproject commit 82821325a6b1645d5607057e9656ef3689f5ae1a
diff --git a/work/CraftBukkit b/work/CraftBukkit
index d5ecbd0e93..ac58f3840e 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit d5ecbd0e93a7a22d3631541c258635fdcc42a489
+Subproject commit ac58f3840ebe6060511c56ca8c4440916ea46425