mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
Fixes #2207
This commit is contained in:
parent
2a8abcbdbf
commit
7a31c88ce9
@ -62,6 +62,7 @@
|
|||||||
* Fixed #2217
|
* Fixed #2217
|
||||||
* Fixed Miner Talisman sending messages when drops were not even doubled
|
* Fixed Miner Talisman sending messages when drops were not even doubled
|
||||||
* Fixed #2077
|
* Fixed #2077
|
||||||
|
* Fixed #2207
|
||||||
|
|
||||||
## Release Candidate 15 (01 Aug 2020)
|
## Release Candidate 15 (01 Aug 2020)
|
||||||
|
|
||||||
|
2
pom.xml
2
pom.xml
@ -22,7 +22,7 @@
|
|||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
<maven.compiler.target>1.8</maven.compiler.target>
|
||||||
|
|
||||||
<!-- Spigot properties -->
|
<!-- Spigot properties -->
|
||||||
<spigot.version>1.16.1</spigot.version>
|
<spigot.version>1.16.2</spigot.version>
|
||||||
<spigot.javadocs>https://hub.spigotmc.org/javadocs/spigot/</spigot.javadocs>
|
<spigot.javadocs>https://hub.spigotmc.org/javadocs/spigot/</spigot.javadocs>
|
||||||
|
|
||||||
<!-- Default settings for sonarcloud.io -->
|
<!-- Default settings for sonarcloud.io -->
|
||||||
|
@ -80,17 +80,18 @@ public class SeismicAxe extends SimpleSlimefunItem<ItemUseHandler> implements No
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void pushEntity(Player p, Entity entity) {
|
private void pushEntity(Player p, Entity entity) {
|
||||||
Vector vector = entity.getLocation().toVector().subtract(p.getLocation().toVector()).normalize();
|
|
||||||
vector.multiply(STRENGTH);
|
|
||||||
vector.setY(0.9);
|
|
||||||
entity.setVelocity(vector);
|
|
||||||
|
|
||||||
if (entity.getType() != EntityType.PLAYER || p.getWorld().getPVP()) {
|
if (entity.getType() != EntityType.PLAYER || p.getWorld().getPVP()) {
|
||||||
EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(p, entity, DamageCause.ENTITY_ATTACK, 6D);
|
EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(p, entity, DamageCause.ENTITY_ATTACK, DAMAGE);
|
||||||
Bukkit.getPluginManager().callEvent(event);
|
Bukkit.getPluginManager().callEvent(event);
|
||||||
|
|
||||||
|
// Fixes #2207 - Only apply Vector if the Player is able to damage the entity
|
||||||
if (!event.isCancelled()) {
|
if (!event.isCancelled()) {
|
||||||
((LivingEntity) entity).damage(DAMAGE);
|
Vector vector = entity.getLocation().toVector().subtract(p.getLocation().toVector()).normalize();
|
||||||
|
vector.multiply(STRENGTH);
|
||||||
|
vector.setY(0.9);
|
||||||
|
entity.setVelocity(vector);
|
||||||
|
|
||||||
|
((LivingEntity) entity).damage(event.getDamage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user