#740: Fix EntityDamageEvent not being called for non EntityDamageSource for End Crystals

This commit is contained in:
DiamondDagger590 2020-08-28 18:41:34 +10:00 committed by md_5
parent 3c7143e7b4
commit 3f572834a6
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11

View File

@ -986,10 +986,6 @@ public class CraftEventFactory {
} }
public static boolean handleNonLivingEntityDamageEvent(Entity entity, DamageSource source, double damage, boolean cancelOnZeroDamage, boolean cancelled) { public static boolean handleNonLivingEntityDamageEvent(Entity entity, DamageSource source, double damage, boolean cancelOnZeroDamage, boolean cancelled) {
if (entity instanceof EntityEnderCrystal && !(source instanceof EntityDamageSource)) {
return false;
}
final EnumMap<DamageModifier, Double> modifiers = new EnumMap<DamageModifier, Double>(DamageModifier.class); final EnumMap<DamageModifier, Double> modifiers = new EnumMap<DamageModifier, Double>(DamageModifier.class);
final EnumMap<DamageModifier, Function<? super Double, Double>> functions = new EnumMap(DamageModifier.class); final EnumMap<DamageModifier, Function<? super Double, Double>> functions = new EnumMap(DamageModifier.class);