diff options
| author | riking <rikingcoding@gmail.com> | 2013-03-23 19:41:33 -0700 |
|---|---|---|
| committer | riking <rikingcoding@gmail.com> | 2013-03-23 19:45:46 -0700 |
| commit | 8d3ba07f93f457f95961b01b8f70bc7f51b79f93 (patch) | |
| tree | f3e4f118e1d6433131d29e659c051ecdb2a86b17 /src/main/java/org | |
| parent | 62c6d223e4d8197eb578c4969d4dba5b30661cfd (diff) | |
| download | craftbukkit-8d3ba07f93f457f95961b01b8f70bc7f51b79f93.tar craftbukkit-8d3ba07f93f457f95961b01b8f70bc7f51b79f93.tar.gz craftbukkit-8d3ba07f93f457f95961b01b8f70bc7f51b79f93.tar.lz craftbukkit-8d3ba07f93f457f95961b01b8f70bc7f51b79f93.tar.xz craftbukkit-8d3ba07f93f457f95961b01b8f70bc7f51b79f93.zip | |
Add check for Thorns damage - Fixes BUKKIT-3505
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index df4e2c33..4ea9c0c3 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); |