Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 21:19:00 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-1523: Add FLY_INTO_WALL DamageCause to fix Elytra crash v2.

Browse Source
This commit is contained in:
md_5 2016-03-01 17:35:18 +11:00
parent f0c37a1671
commit 4831c56cdb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -465,7 +465,7 @@ public class CraftEventFactory {
DamageCause cause = null; DamageCause cause = null;
Block damager = blockDamage; Block damager = blockDamage;
blockDamage = null; blockDamage = null;
if (source == DamageSource.CACTUS || source == DamageSource.j) { // PAIL: rename if (source == DamageSource.CACTUS) {
cause = DamageCause.CONTACT; cause = DamageCause.CONTACT;
} else { } else {
throw new AssertionError(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex)); throw new AssertionError(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex));
@ -518,6 +518,8 @@ public class CraftEventFactory {
cause = DamageCause.MAGIC; cause = DamageCause.MAGIC;
} else if (source == DamageSource.FALL) { } else if (source == DamageSource.FALL) {
cause = DamageCause.FALL; cause = DamageCause.FALL;
} else if (source == DamageSource.j) { // PAIL: rename
cause = DamageCause.FLY_INTO_WALL;
} else if (source == DamageSource.GENERIC) { } else if (source == DamageSource.GENERIC) {
return new EntityDamageEvent(entity.getBukkitEntity(), null, modifiers, modifierFunctions); return new EntityDamageEvent(entity.getBukkitEntity(), null, modifiers, modifierFunctions);
} }