From 8d3ba07f93f457f95961b01b8f70bc7f51b79f93 Mon Sep 17 00:00:00 2001 From: riking Date: Sat, 23 Mar 2013 19:41:33 -0700 Subject: [PATCH] Add check for Thorns damage - Fixes BUKKIT-3505 --- .../java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index df4e2c33f0..4ea9c0c3cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -389,6 +389,8 @@ public class CraftEventFactory { } else if (damager.getBukkitEntity() instanceof Projectile) { cause = DamageCause.PROJECTILE; } + } else if ("thorns".equals(source.translationIndex)) { + cause = DamageCause.THORNS; } return callEntityDamageEvent(damager, entity, cause, damage);