diff --git a/src/main/java/com/songoda/skyblock/permission/permissions/listening/BrewingPermission.java b/src/main/java/com/songoda/skyblock/permission/permissions/listening/BrewingPermission.java index e7b014b4..74c68845 100644 --- a/src/main/java/com/songoda/skyblock/permission/permissions/listening/BrewingPermission.java +++ b/src/main/java/com/songoda/skyblock/permission/permissions/listening/BrewingPermission.java @@ -38,15 +38,4 @@ public class BrewingPermission extends ListeningPermission { if (CompatibleMaterial.getMaterial(block) == CompatibleMaterial.BREWING_STAND) cancelAndMessage(event, player, plugin, messageManager); } - - @PermissionHandler - public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { - if (!(event.getDamager() instanceof Player)) return; - Player player = (Player)event.getDamager(); - Entity entity = event.getEntity(); - - if (!(entity instanceof Monster)) return; - - cancelAndMessage(event, player, plugin, messageManager); - } } diff --git a/src/main/java/com/songoda/skyblock/permission/permissions/listening/MonsterHurtingPermission.java b/src/main/java/com/songoda/skyblock/permission/permissions/listening/MonsterHurtingPermission.java index 8d2558ef..75fea9e8 100644 --- a/src/main/java/com/songoda/skyblock/permission/permissions/listening/MonsterHurtingPermission.java +++ b/src/main/java/com/songoda/skyblock/permission/permissions/listening/MonsterHurtingPermission.java @@ -7,6 +7,7 @@ import com.songoda.skyblock.permission.ListeningPermission; import com.songoda.skyblock.permission.PermissionHandler; import com.songoda.skyblock.permission.PermissionPriority; import com.songoda.skyblock.permission.PermissionType; +import org.bukkit.Bukkit; import org.bukkit.entity.*; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -32,8 +33,8 @@ public class MonsterHurtingPermission extends ListeningPermission { Entity entity = event.getEntity(); - if (entity.getType() == EntityType.ARMOR_STAND || !(entity instanceof Monster)) return; - - cancelAndMessage(event, player, plugin, messageManager); + if (entity instanceof Monster){ + cancelAndMessage(event, player, plugin, messageManager); + } } }