Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-04 14:41:29 +01:00
Code Issues Projects Releases Wiki Activity

[Bleeding] Ignore damage done by LivingEntity.damage(). Fixes BUKKIT-5666

Browse Source 
This matches behavior previous to new damage event API of not throwing
events for plugin-triggered damage.
This commit is contained in:
t00thpick1 2014-06-22 22:54:05 -04:00 committed by Wesley Wolfe
parent 6364f59ac4
commit 9099e48e74
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,6 +511,8 @@ public class CraftEventFactory {
cause = DamageCause.MAGIC;
} else if (source == DamageSource.FALL) {
cause = DamageCause.FALL;
} else if (source == DamageSource.GENERIC) {
return new EntityDamageEvent(entity.getBukkitEntity(), null, modifiers);
}
if (cause != null) {