diff options
author | md_5 <git@md-5.net> | 2016-07-02 14:01:31 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-07-02 14:01:31 +1000 |
commit | 67b242440b79352602c8328158effcd5a4c1fda9 (patch) | |
tree | 839cc0f94be0662a799d30dd34d47197af5d64bc /src | |
parent | 1628ce6240534a89a0f0d9bd818448b2b31d199c (diff) | |
download | craftbukkit-67b242440b79352602c8328158effcd5a4c1fda9.tar craftbukkit-67b242440b79352602c8328158effcd5a4c1fda9.tar.gz craftbukkit-67b242440b79352602c8328158effcd5a4c1fda9.tar.lz craftbukkit-67b242440b79352602c8328158effcd5a4c1fda9.tar.xz craftbukkit-67b242440b79352602c8328158effcd5a4c1fda9.zip |
SPIGOT-1515: Use CUSTOM reason for GENERIC damage
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index eac41e0e..5c9ea4de 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -551,7 +551,7 @@ public class CraftEventFactory { } else if (source == DamageSource.FLY_INTO_WALL) { cause = DamageCause.FLY_INTO_WALL; } else if (source == DamageSource.GENERIC) { - return new EntityDamageEvent(entity.getBukkitEntity(), null, modifiers, modifierFunctions); + cause = DamageCause.CUSTOM; } if (cause != null) { @@ -581,7 +581,7 @@ public class CraftEventFactory { private static final Function<? super Double, Double> ZERO = Functions.constant(-0.0); public static EntityDamageEvent handleLivingEntityDamageEvent(Entity damagee, DamageSource source, double rawDamage, double hardHatModifier, double blockingModifier, double armorModifier, double resistanceModifier, double magicModifier, double absorptionModifier, Function<Double, Double> hardHat, Function<Double, Double> blocking, Function<Double, Double> armor, Function<Double, Double> resistance, Function<Double, Double> magic, Function<Double, Double> absorption) { - Map<DamageModifier, Double> modifiers = new EnumMap<DamageModifier, Double>(DamageModifier.class); + Map<DamageModifier, Double> modifiers = new EnumMap<DamageModifier, Double>(DamageModifier.class); Map<DamageModifier, Function<? super Double, Double>> modifierFunctions = new EnumMap<DamageModifier, Function<? super Double, Double>>(DamageModifier.class); modifiers.put(DamageModifier.BASE, rawDamage); modifierFunctions.put(DamageModifier.BASE, ZERO); |