diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e22b461e..442fab96e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ * Fixed #2184 * Fixed #2183 * Fixed #2181 +* Fixed #2180 ## Release Candidate 15 (01 Aug 2020) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/ExplosiveBow.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/ExplosiveBow.java index 0a4e82b1c..ac1b31420 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/ExplosiveBow.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/ExplosiveBow.java @@ -63,14 +63,13 @@ public class ExplosiveBow extends SlimefunBow { double distanceSquared = distanceVector.lengthSquared(); double damage = calculateDamage(distanceSquared, e.getDamage()); - Vector knockback = velocity.add(distanceVector.normalize().multiply((int) (e.getDamage() / damage))); - entity.setVelocity(knockback); - if (!entity.getUniqueId().equals(target.getUniqueId())) { EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(e.getDamager(), entity, EntityDamageEvent.DamageCause.ENTITY_EXPLOSION, damage); Bukkit.getPluginManager().callEvent(event); if (!event.isCancelled()) { + Vector knockback = velocity.add(distanceVector.normalize().multiply((int) (e.getDamage() / damage))); + entity.setVelocity(knockback); entity.damage(event.getDamage()); } }