mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[Bleeding] Fixed potions throwing double events. Fixes BUKKIT-1332

Browse source 
By: feildmaster <admin@feildmaster.com>
This commit is contained in:
CraftBukkit/Spigot 2012-03-25 04:21:25 -05:00
commit ae4b2591f7
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View file

@ -364,14 +364,17 @@ public class CraftEventFactory {
public static EntityDamageEvent handleEntityDamageEvent(Entity entity, DamageSource source, int damage) { public static EntityDamageEvent handleEntityDamageEvent(Entity entity, DamageSource source, int damage) {
Entity damager = source.getEntity(); Entity damager = source.getEntity();
EntityDamageEvent.DamageCause cause = EntityDamageEvent.DamageCause.ENTITY_ATTACK; DamageCause cause = DamageCause.ENTITY_ATTACK;
if (source instanceof EntityDamageSourceIndirect) { if (source instanceof EntityDamageSourceIndirect) {
damager = ((EntityDamageSourceIndirect) source).getProximateDamageSource(); damager = ((EntityDamageSourceIndirect) source).getProximateDamageSource();
if (damager.getBukkitEntity() instanceof Projectile) { if (damager.getBukkitEntity() instanceof ThrownPotion) {
cause = EntityDamageEvent.DamageCause.PROJECTILE; cause = DamageCause.MAGIC;
} // Else, magic..? } else if (damager.getBukkitEntity() instanceof Projectile) {
cause = DamageCause.PROJECTILE;
} }
}
return callEntityDamageEvent(damager, entity, cause, damage); return callEntityDamageEvent(damager, entity, cause, damage);
} }