diff options
| author | md_5 <git@md-5.net> | 2016-03-01 11:27:13 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-01 11:27:13 +1100 |
| commit | ea28c1e47856f1f3842eea6ba26b81dd319c525f (patch) | |
| tree | a9fb7bb9f79747ddced863267b12200ed82b37fc /src | |
| parent | f5d92d6b12dcc43cb9a05f2e16357ebe0d9fdc20 (diff) | |
| download | craftbukkit-ea28c1e47856f1f3842eea6ba26b81dd319c525f.tar craftbukkit-ea28c1e47856f1f3842eea6ba26b81dd319c525f.tar.gz craftbukkit-ea28c1e47856f1f3842eea6ba26b81dd319c525f.tar.lz craftbukkit-ea28c1e47856f1f3842eea6ba26b81dd319c525f.tar.xz craftbukkit-ea28c1e47856f1f3842eea6ba26b81dd319c525f.zip | |
SPIGOT-1523: Crash when flying Elytra into wall.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index 86820c23..abeab037 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -465,7 +465,7 @@ public class CraftEventFactory { DamageCause cause = null; Block damager = blockDamage; blockDamage = null; - if (source == DamageSource.CACTUS) { + if (source == DamageSource.CACTUS || source == DamageSource.j) { // PAIL: rename cause = DamageCause.CONTACT; } else { throw new AssertionError(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex)); |