spigot/CraftBukkit-Patches/0147-Add-damager-to-the-unhandled-error.patch
md_5 64352d6745 Upstream merge.
Mikeprimm's lighter nibble arrays have been removed since they have been incorporate d upstream.
2014-06-27 20:50:08 +10:00

22 lines
1.1 KiB
Diff

From c751b7b7a7d1aad44ff213bf01aa391bd130fe25 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
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 e6377c1..efa7741 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -498,7 +498,7 @@ public class CraftEventFactory {
} else if (source == DamageSource.FALL) {
cause = DamageCause.FALL;
} else {
- throw new RuntimeException("Unhandled entity damage");
+ throw new RuntimeException("Unhandled entity damage from " + damager.getHandle().getName()); // Spigot - Add damager
}
EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers));
if (!event.isCancelled()) {
--
1.9.1