mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
Fixes #2180
This commit is contained in:
parent
f409b869ae
commit
484c7a22ec
@ -36,6 +36,7 @@
|
|||||||
* Fixed #2184
|
* Fixed #2184
|
||||||
* Fixed #2183
|
* Fixed #2183
|
||||||
* Fixed #2181
|
* Fixed #2181
|
||||||
|
* Fixed #2180
|
||||||
|
|
||||||
## Release Candidate 15 (01 Aug 2020)
|
## Release Candidate 15 (01 Aug 2020)
|
||||||
|
|
||||||
|
@ -63,14 +63,13 @@ public class ExplosiveBow extends SlimefunBow {
|
|||||||
double distanceSquared = distanceVector.lengthSquared();
|
double distanceSquared = distanceVector.lengthSquared();
|
||||||
double damage = calculateDamage(distanceSquared, e.getDamage());
|
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())) {
|
if (!entity.getUniqueId().equals(target.getUniqueId())) {
|
||||||
EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(e.getDamager(), entity, EntityDamageEvent.DamageCause.ENTITY_EXPLOSION, damage);
|
EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(e.getDamager(), entity, EntityDamageEvent.DamageCause.ENTITY_EXPLOSION, damage);
|
||||||
Bukkit.getPluginManager().callEvent(event);
|
Bukkit.getPluginManager().callEvent(event);
|
||||||
|
|
||||||
if (!event.isCancelled()) {
|
if (!event.isCancelled()) {
|
||||||
|
Vector knockback = velocity.add(distanceVector.normalize().multiply((int) (e.getDamage() / damage)));
|
||||||
|
entity.setVelocity(knockback);
|
||||||
entity.damage(event.getDamage());
|
entity.damage(event.getDamage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user