Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-24 19:55:17 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into multigame

Browse Source
This commit is contained in:
tastybento 2018-05-20 14:18:38 -07:00
commit 576d9ff314
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 hurtMobs
*/
private void respond(Event event, Entity damager, Flag hurtMobs) {
private void respond(EntityDamageByEntityEvent event, Entity damager, Flag hurtMobs) {
// Get the attacker
if (damager instanceof Player) {
setUser(User.getInstance(damager)).checkIsland(event, damager.getLocation(), hurtMobs);
@ -76,12 +76,11 @@ public class HurtingListener extends AbstractFlagListener {
Projectile p = (Projectile) damager;
if (p.getShooter() instanceof Player) {
if (!setUser(User.getInstance((Player)p.getShooter())).checkIsland(event, damager.getLocation(), hurtMobs)) {
damager.setFireTicks(0);
event.getEntity().setFireTicks(0);
damager.remove();
}
}
}
}
/**