diff --git a/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch index a663191e7..29d99d32e 100644 --- a/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch +++ b/CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch @@ -1,11 +1,11 @@ -From 0bbc7f4798cc4ff7c9329671144e8c4081650185 Mon Sep 17 00:00:00 2001 +From 023d703153ac0998fb8887392a6c55f8e8ce4fc4 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Jun 2014 23:42:52 +0100 Subject: [PATCH] Add damager to the unhandled error diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index abeab03..beee3a9 100644 +index b7d747c..b9ba131 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -170,7 +170,7 @@ public class CraftEventFactory { @@ -18,7 +18,7 @@ index abeab03..beee3a9 100644 return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack); } @@ -468,7 +468,7 @@ public class CraftEventFactory { - if (source == DamageSource.CACTUS || source == DamageSource.j) { // PAIL: rename + if (source == DamageSource.CACTUS) { cause = DamageCause.CONTACT; } else { - throw new AssertionError(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex)); @@ -35,7 +35,7 @@ index abeab03..beee3a9 100644 } EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions)); if (!event.isCancelled()) { -@@ -526,7 +526,7 @@ public class CraftEventFactory { +@@ -528,7 +528,7 @@ public class CraftEventFactory { return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions); }