Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-27 04:35:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix for MonsterHurting setting

Browse Source
This commit is contained in:
Fabrizio La Rosa 2020-06-24 18:58:39 +02:00
parent 59fc4f2bd9
commit dffd68e503
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/songoda/skyblock/permission/permissions/listening/BrewingPermission.java
View File

@ -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);
}
}

7
src/main/java/com/songoda/skyblock/permission/permissions/listening/MonsterHurtingPermission.java
View File

@ -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);
}
}
}