fix block restrictions and add getEventPlayer method

Author: Grazen0

src/main/java/com/elchologamer/userlogin/listener/restriction/AttackRestriction.java

@@ -1,8 +1,6 @@
 package com.elchologamer.userlogin.listener.restriction;
 
-import com.elchologamer.userlogin.api.UserLoginAPI;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
@@ -14,13 +12,9 @@ public AttackRestriction() {
     }
 
     @Override
-    public boolean shouldRestrict(EntityDamageByEntityEvent event) {
-        if (!getPlugin().getConfig().getBoolean("restrictions." + configKey)) return false;
-
+    protected Player getEventPlayer(EntityDamageByEntityEvent event) {
         Entity damager = event.getDamager();
-        if (damager.getType() != EntityType.PLAYER) return false;
-
-        return !UserLoginAPI.isLoggedIn((Player) damager);
+        return damager instanceof Player ? (Player) damager : null;
     }
 
     @EventHandler

src/main/java/com/elchologamer/userlogin/listener/restriction/BaseRestriction.java

@@ -29,13 +29,7 @@ public boolean shouldRestrict(E event) {
 
         RestrictionEvent<E> restrictionEvent = new RestrictionEvent<>(event);
 
-        Player player = null;
-
-        if (event instanceof PlayerEvent) {
-            player = ((PlayerEvent) event).getPlayer();
-        } else if (event instanceof EntityEvent && ((EntityEvent) event).getEntityType() == EntityType.PLAYER) {
-            player = (Player) ((EntityEvent) event).getEntity();
-        }
+        Player player = getEventPlayer(event);
 
         if (player == null || UserLoginAPI.isLoggedIn(player)) return false;
 
@@ -46,6 +40,20 @@ public boolean shouldRestrict(E event) {
         return !restrictionEvent.isCancelled();
     }
 
+    protected Player getEventPlayer(E event) {
+        if (event instanceof PlayerEvent) {
+            return ((PlayerEvent) event).getPlayer();
+        } else if (event instanceof EntityEvent) {
+            EntityEvent ee = (EntityEvent) event;
+
+            if (ee.getEntityType() == EntityType.PLAYER) {
+                return (Player) ee.getEntity();
+            }
+        }
+
+        return null;
+    }
+
     public UserLogin getPlugin() {
         return plugin;
     }

src/main/java/com/elchologamer/userlogin/listener/restriction/BlockBreakingRestriction.java

@@ -1,5 +1,6 @@
 package com.elchologamer.userlogin.listener.restriction;
 
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockBreakEvent;
 
@@ -9,6 +10,11 @@ public BlockBreakingRestriction() {
         super("blockBreaking");
     }
 
+    @Override
+    protected Player getEventPlayer(BlockBreakEvent event) {
+        return event.getPlayer();
+    }
+
     @EventHandler
     public void handle(BlockBreakEvent e) {
         if (shouldRestrict(e)) e.setCancelled(true);

src/main/java/com/elchologamer/userlogin/listener/restriction/BlockPlacingRestriction.java

@@ -1,6 +1,6 @@
 package com.elchologamer.userlogin.listener.restriction;
 
-import com.elchologamer.userlogin.api.UserLoginAPI;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockPlaceEvent;
 
@@ -11,8 +11,8 @@ public BlockPlacingRestriction() {
     }
 
     @Override
-    public boolean shouldRestrict(BlockPlaceEvent e) {
-        return super.shouldRestrict(e) && !UserLoginAPI.isLoggedIn(e.getPlayer());
+    protected Player getEventPlayer(BlockPlaceEvent event) {
+        return event.getPlayer();
     }
 
     @EventHandler

src/main/java/com/elchologamer/userlogin/listener/restriction/ItemPickupRestriction.java

@@ -1,6 +1,5 @@
 package com.elchologamer.userlogin.listener.restriction;
 
-import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityPickupItemEvent;
 
@@ -12,7 +11,7 @@ public ItemPickupRestriction() {
 
     @EventHandler
     public void handle(EntityPickupItemEvent e) {
-        if (e.getEntityType() == EntityType.PLAYER && shouldRestrict(e))
+        if (shouldRestrict(e))
             e.setCancelled(true);
     }
 }