Update upstream CB

Closes GH-596
2017-02-01 22:48:16 -06:00
parent a3cc3e37bd
commit 789bb0b834
5 changed files with 6 additions and 6 deletions
--- a/Spigot-Server-Patches/Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/Set-health-before-death-event.patch
@@ -19,7 +19,7 @@ index 7da844e43..4103d4966 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 392e72bb5..a7ca9a508 100644
+index eeb4f5b32..b7e832f31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {