Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-17 21:02:20 +01:00
Code Issues Projects Releases Wiki Activity

Fixes https://github.com/tastybento/bskyblock/issues/166

Browse Source
This commit is contained in:
Florian CUNY 2018-05-20 22:00:22 +02:00
parent 21aa1691a5
commit 736ba10c53
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/us/tastybento/bskyblock/listeners/flags/HurtingListener.java
View File

@ -67,7 +67,7 @@ public class HurtingListener extends AbstractFlagListener {
* @param damager * @param damager
* @param hurtMobs * @param hurtMobs
*/ */
private void respond(Event event, Entity damager, Flag hurtMobs) { private void respond(EntityDamageByEntityEvent event, Entity damager, Flag hurtMobs) {
// Get the attacker // Get the attacker
if (damager instanceof Player) { if (damager instanceof Player) {
setUser(User.getInstance(damager)).checkIsland(event, damager.getLocation(), hurtMobs); setUser(User.getInstance(damager)).checkIsland(event, damager.getLocation(), hurtMobs);
@ -76,12 +76,11 @@ public class HurtingListener extends AbstractFlagListener {
Projectile p = (Projectile) damager; Projectile p = (Projectile) damager;
if (p.getShooter() instanceof Player) { if (p.getShooter() instanceof Player) {
if (!setUser(User.getInstance((Player)p.getShooter())).checkIsland(event, damager.getLocation(), hurtMobs)) { if (!setUser(User.getInstance((Player)p.getShooter())).checkIsland(event, damager.getLocation(), hurtMobs)) {
damager.setFireTicks(0); event.getEntity().setFireTicks(0);
damager.remove(); damager.remove();
} }
} }
} }
} }
/** /**