Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-07-05 11:04:48 +02:00
Code Issues Projects Releases Wiki Activity

Reworked pvp permission

Browse Source
This commit is contained in:
Fabrizio La Rosa 2020-06-18 16:17:55 +02:00
parent 54aaed3fd6
commit d94d7923b8
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/songoda/skyblock/permission/permissions/listening/PvpPermission.java
View File

@ -28,14 +28,15 @@ public class PvpPermission extends ListeningPermission {
@PermissionHandler @PermissionHandler
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
Entity entity = event.getEntity(); Player attacker = null;
Player player;
if (event.getDamager() instanceof Player) if (event.getDamager() instanceof Player)
player = (Player) event.getDamager(); attacker = (Player) event.getDamager();
else if (event.getDamager() instanceof Projectile && ((Projectile) event.getDamager()).getShooter() instanceof Player) else if (event.getDamager() instanceof Projectile && ((Projectile) event.getDamager()).getShooter() instanceof Player)
player = (Player) ((Projectile) event.getDamager()).getShooter(); attacker = (Player) ((Projectile) event.getDamager()).getShooter();
else return;
if(attacker instanceof Player
&& event.getEntity() instanceof Player){
Player victim = (Player) event.getEntity();
FileManager.Config config = fileManager.getConfig(new File(plugin.getDataFolder(), "config.yml")); FileManager.Config config = fileManager.getConfig(new File(plugin.getDataFolder(), "config.yml"));
FileConfiguration configLoad = config.getFileConfiguration(); FileConfiguration configLoad = config.getFileConfiguration();
@ -46,8 +47,8 @@ public class PvpPermission extends ListeningPermission {
event.setCancelled(true); event.setCancelled(true);
} }
if (entity.getType() == EntityType.ARMOR_STAND || !(entity instanceof Monster)) return; cancelAndMessage(event, victim, plugin, messageManager);
}
cancelAndMessage(event, player, plugin, messageManager);
} }
} }