From 7acacb707a3c109d828421b88a8b015e434a4f93 Mon Sep 17 00:00:00 2001 From: Aria Sangarin Date: Sat, 15 Feb 2020 00:10:37 +0100 Subject: [PATCH] sentinel bug fix --- .../net/Indyuce/mmocore/listener/PlayerListener.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java b/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java index 65ed8e06..b282e7a5 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java @@ -50,16 +50,16 @@ public class PlayerListener implements Listener { */ @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void d(EntityDamageByEntityEvent event) { - if (event.getEntity().hasMetadata("NPC")) - return; - if (event.getEntity() instanceof Player) + if (event.getEntity() instanceof Player && !event.getEntity().hasMetadata("NPC")) PlayerData.get((Player) event.getEntity()).updateCombat(); - if (event.getDamager() instanceof Player) + if (event.getDamager() instanceof Player && !event.getDamager().hasMetadata("NPC")) PlayerData.get((Player) event.getDamager()).updateCombat(); - if (event.getDamager() instanceof Projectile && ((Projectile) event.getDamager()).getShooter() instanceof Player) + if (event.getDamager() instanceof Projectile && ((Projectile) event.getDamager()).getShooter() instanceof Player) { + if(((Player) ((Projectile) event.getDamager()).getShooter()).hasMetadata("NPC")) return; PlayerData.get((Player) ((Projectile) event.getDamager()).getShooter()).updateCombat(); + } } @EventHandler