From 59643f90bcb03c58fc888f4ceeaeece5a157ba66 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Thu, 10 Jul 2014 21:47:05 -0500
Subject: [PATCH] Use CraftBukkit's damage API fix instead of our own ...
 here's hoping theirs works

---
 Bukkit                                        |  2 +-
 CraftBukkit                                   |  2 +-
 ....patch => 0025-Better-EULA-handling.patch} |  0
 ...25-Revert-Bukkit-Damage-API-Behavior.patch | 53 -------------------
 ...sts.patch => 0026-Don-t-tick-chests.patch} |  0
 ...7-Configurable-nerf-for-TNT-cannons.patch} |  0
 6 files changed, 2 insertions(+), 55 deletions(-)
 rename CraftBukkit-Patches/{0026-Better-EULA-handling.patch => 0025-Better-EULA-handling.patch} (100%)
 delete mode 100644 CraftBukkit-Patches/0025-Revert-Bukkit-Damage-API-Behavior.patch
 rename CraftBukkit-Patches/{0027-Don-t-tick-chests.patch => 0026-Don-t-tick-chests.patch} (100%)
 rename CraftBukkit-Patches/{0028-Configurable-nerf-for-TNT-cannons.patch => 0027-Configurable-nerf-for-TNT-cannons.patch} (100%)

diff --git a/Bukkit b/Bukkit
index 07794f4def..f2854540c2 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 07794f4defd6dc688836cd5988d551ba8bac2fe6
+Subproject commit f2854540c2e535fb3e2d89460ee87f0cfa4daca7
diff --git a/CraftBukkit b/CraftBukkit
index c3553415a1..dc0b6f5e82 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit c3553415a159ea22c795e79ea71d7b859455a00f
+Subproject commit dc0b6f5e82a2bfa521574bfa07cc8b00c486c42e
diff --git a/CraftBukkit-Patches/0026-Better-EULA-handling.patch b/CraftBukkit-Patches/0025-Better-EULA-handling.patch
similarity index 100%
rename from CraftBukkit-Patches/0026-Better-EULA-handling.patch
rename to CraftBukkit-Patches/0025-Better-EULA-handling.patch
diff --git a/CraftBukkit-Patches/0025-Revert-Bukkit-Damage-API-Behavior.patch b/CraftBukkit-Patches/0025-Revert-Bukkit-Damage-API-Behavior.patch
deleted file mode 100644
index ce42bb021c..0000000000
--- a/CraftBukkit-Patches/0025-Revert-Bukkit-Damage-API-Behavior.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Tue, 8 Jul 2014 21:49:42 -0500
-Subject: [PATCH] Revert Bukkit Damage API Behavior
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
-     // CraftBukkit start
-     protected boolean d(DamageSource damagesource, float f) { // void -> boolean
-         if (!this.isInvulnerable()) {
-+            // PaperSpigot start - moved up from below to bring back old behavior
-+            EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, f, 0, 0, 0, 0, 0, 0);
-+
-+            if (event.isCancelled()) {
-+                return false;
-+            }
-+
-+            f = (float) event.getDamage();
-+            // PaperSpigot end
-+
-             boolean human = this instanceof EntityHuman;
-             float originalDamage = f;
-             float preDamage = f;
-@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
-             f = Math.max(f - this.getAbsorptionHearts(), 0.0F);
-             float absorptionModifier = Math.max(f1 - f, 0.0F);
- 
--            EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, -hardHatModifier, -blockingModifier, -armorModifier, -resistanceModifier, -magicModifier, -absorptionModifier);
--
--            if (event.isCancelled()) {
--                return false;
-+            // PaperSpigot start - Moved event call up
-+            event.setDamage(DamageModifier.ARMOR, -armorModifier);
-+            if (damagesource == DamageSource.FALLING_BLOCK || damagesource == DamageSource.ANVIL) {
-+                event.setDamage(DamageModifier.HARD_HAT, -hardHatModifier);
-             }
- 
--            f = (float) event.getFinalDamage();
-+            if (human) {
-+                event.setDamage(DamageModifier.BLOCKING, -blockingModifier);
-+            }
-+            event.setDamage(DamageModifier.RESISTANCE, -resistanceModifier);
-+            event.setDamage(DamageModifier.MAGIC, -magicModifier);
-+            event.setDamage(DamageModifier.ABSORPTION, -absorptionModifier);
-+            // PaperSpigot end
- 
-             // Apply damage to helmet
-             if ((damagesource == DamageSource.ANVIL || damagesource == DamageSource.FALLING_BLOCK) && this.getEquipment(4) != null) {
---
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0027-Don-t-tick-chests.patch b/CraftBukkit-Patches/0026-Don-t-tick-chests.patch
similarity index 100%
rename from CraftBukkit-Patches/0027-Don-t-tick-chests.patch
rename to CraftBukkit-Patches/0026-Don-t-tick-chests.patch
diff --git a/CraftBukkit-Patches/0028-Configurable-nerf-for-TNT-cannons.patch b/CraftBukkit-Patches/0027-Configurable-nerf-for-TNT-cannons.patch
similarity index 100%
rename from CraftBukkit-Patches/0028-Configurable-nerf-for-TNT-cannons.patch
rename to CraftBukkit-Patches/0027-Configurable-nerf-for-TNT-cannons.patch