diff options
| author | md_5 <git@md-5.net> | 2018-08-28 21:00:24 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-08-28 21:00:24 +1000 |
| commit | 9636bb8d77ea0463b9fa9c9e08787b6ee843eb1c (patch) | |
| tree | e1027b350b24b50fc6a024ba7077fa0ccbe66564 /src/main/java/org | |
| parent | 4228a56c0dcb17c9c1333619d2faa21f6c02bfc1 (diff) | |
| download | craftbukkit-9636bb8d77ea0463b9fa9c9e08787b6ee843eb1c.tar craftbukkit-9636bb8d77ea0463b9fa9c9e08787b6ee843eb1c.tar.gz craftbukkit-9636bb8d77ea0463b9fa9c9e08787b6ee843eb1c.tar.lz craftbukkit-9636bb8d77ea0463b9fa9c9e08787b6ee843eb1c.tar.xz craftbukkit-9636bb8d77ea0463b9fa9c9e08787b6ee843eb1c.zip | |
SPIGOT-4319: Conduit damage should be a block event
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 a50f91c9..daaf5037 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -507,6 +507,8 @@ public class CraftEventFactory { cause = DamageCause.CONTACT; } else if (source == DamageSource.HOT_FLOOR) { cause = DamageCause.HOT_FLOOR; + } else if (source == DamageSource.MAGIC) { + cause = DamageCause.MAGIC; } else { throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex)); } |