Delete duplicated code

TonimatasDEV · Feb 13, 2024 · e4de063 · e4de063
1 parent 7fc4f32
commit e4de063
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 65 deletions.
diff --git a/src/main/java/net/tonimatasdev/perworldplugins/api/PerWorldRegisteredListener.java b/src/main/java/net/tonimatasdev/perworldplugins/api/PerWorldRegisteredListener.java
@@ -5,14 +5,6 @@
 import org.bukkit.event.Event;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockEvent;
-import org.bukkit.event.entity.EntityEvent;
-import org.bukkit.event.hanging.HangingEvent;
-import org.bukkit.event.inventory.InventoryEvent;
-import org.bukkit.event.player.PlayerEvent;
-import org.bukkit.event.vehicle.VehicleEvent;
-import org.bukkit.event.weather.WeatherEvent;
-import org.bukkit.event.world.WorldEvent;
 import org.bukkit.plugin.EventExecutor;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredListener;
@@ -32,24 +24,8 @@ public PerWorldRegisteredListener(Listener listener, EventExecutor executor, Eve
     @SuppressWarnings("NullableProblems")
     public void callEvent(Event event) {
         // If X-Events get player and detect if blocked so that it is not run.
-
-        if (event instanceof PlayerEvent) {
-            if (disabledWorlds.contains(((PlayerEvent) event).getPlayer().getWorld().getName())) return;
-        } else if (event instanceof EntityEvent) {
-            if (disabledWorlds.contains(((EntityEvent) event).getEntity().getWorld().getName())) return;
-        } else if (event instanceof BlockEvent) {
-            if (disabledWorlds.contains(((BlockEvent) event).getBlock().getWorld().getName())) return;
-        } else if (event instanceof WorldEvent) {
-            if (disabledWorlds.contains(((WorldEvent) event).getWorld().getName())) return;
-        } else if (event instanceof HangingEvent) {
-            if (disabledWorlds.contains(((HangingEvent) event).getEntity().getWorld().getName())) return;
-        } else if (event instanceof InventoryEvent) {
-            if (disabledWorlds.contains(((InventoryEvent) event).getView().getPlayer().getWorld().getName())) return;
-        } else if (event instanceof VehicleEvent) {
-            if (disabledWorlds.contains(((VehicleEvent) event).getVehicle().getWorld().getName())) return;
-        } else if (event instanceof WeatherEvent) {
-            if (disabledWorlds.contains(((WeatherEvent) event).getWorld().getName())) return;
-        }
+
+        if (PerWorldUtils.checkEvent(event, this.disabledWorlds)) return;
 
         try {
             // Execute the event if it is not blocked.

diff --git a/src/main/java/net/tonimatasdev/perworldplugins/api/PerWorldTimedRegisteredListener.java b/src/main/java/net/tonimatasdev/perworldplugins/api/PerWorldTimedRegisteredListener.java
@@ -5,14 +5,6 @@
 import org.bukkit.event.Event;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockEvent;
-import org.bukkit.event.entity.EntityEvent;
-import org.bukkit.event.hanging.HangingEvent;
-import org.bukkit.event.inventory.InventoryEvent;
-import org.bukkit.event.player.PlayerEvent;
-import org.bukkit.event.vehicle.VehicleEvent;
-import org.bukkit.event.weather.WeatherEvent;
-import org.bukkit.event.world.WorldEvent;
 import org.bukkit.plugin.EventExecutor;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.TimedRegisteredListener;
@@ -32,37 +24,7 @@ public PerWorldTimedRegisteredListener(Listener listener, EventExecutor executor
     @SuppressWarnings("NullableProblems")
     public void callEvent(Event event) {
         // If X-Events get player and detect if blocked so that it is not run.
-        if (event instanceof BlockEvent) {
-            if (disabledWorlds.contains(((BlockEvent) event).getBlock().getWorld().getName())) return;
-        }
-
-        if (event instanceof EntityEvent) {
-            if (disabledWorlds.contains(((EntityEvent) event).getEntity().getWorld().getName())) return;
-        }
-
-        if (event instanceof HangingEvent) {
-            if (disabledWorlds.contains(((HangingEvent) event).getEntity().getWorld().getName())) return;
-        }
-
-        if (event instanceof InventoryEvent) {
-            if (disabledWorlds.contains(((InventoryEvent) event).getView().getPlayer().getWorld().getName())) return;
-        }
-
-        if (event instanceof PlayerEvent) {
-            if (disabledWorlds.contains(((PlayerEvent) event).getPlayer().getWorld().getName())) return;
-        }
-
-        if (event instanceof VehicleEvent) {
-            if (disabledWorlds.contains(((VehicleEvent) event).getVehicle().getWorld().getName())) return;
-        }
-
-        if (event instanceof WeatherEvent) {
-            if (disabledWorlds.contains(((WeatherEvent) event).getWorld().getName())) return;
-        }
-
-        if (event instanceof WorldEvent) {
-            if (disabledWorlds.contains(((WorldEvent) event).getWorld().getName())) return;
-        }
+        if (PerWorldUtils.checkEvent(event, this.disabledWorlds)) return;
 
         try {
             // Execute the event if it is not blocked.

diff --git a/src/main/java/net/tonimatasdev/perworldplugins/util/PerWorldUtils.java b/src/main/java/net/tonimatasdev/perworldplugins/util/PerWorldUtils.java
@@ -5,6 +5,15 @@
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
+import org.bukkit.event.Event;
+import org.bukkit.event.block.BlockEvent;
+import org.bukkit.event.entity.EntityEvent;
+import org.bukkit.event.hanging.HangingEvent;
+import org.bukkit.event.inventory.InventoryEvent;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.event.vehicle.VehicleEvent;
+import org.bukkit.event.weather.WeatherEvent;
+import org.bukkit.event.world.WorldEvent;
 import org.bukkit.plugin.Plugin;
 
 import java.util.ArrayList;
@@ -44,4 +53,27 @@ public static List<String> getDisabledWorlds(Plugin plugin) {
             return serverWorlds;
         }
     }
+
+    public static boolean checkEvent(Event event, List<String> disabledWorlds) {
+        // Get world for every type of Event
+        if (event instanceof PlayerEvent) {
+            return disabledWorlds.contains(((PlayerEvent) event).getPlayer().getWorld().getName());
+        } else if (event instanceof EntityEvent) {
+            return disabledWorlds.contains(((EntityEvent) event).getEntity().getWorld().getName());
+        } else if (event instanceof BlockEvent) {
+            return disabledWorlds.contains(((BlockEvent) event).getBlock().getWorld().getName());
+        } else if (event instanceof WorldEvent) {
+            return disabledWorlds.contains(((WorldEvent) event).getWorld().getName());
+        } else if (event instanceof HangingEvent) {
+            return disabledWorlds.contains(((HangingEvent) event).getEntity().getWorld().getName());
+        } else if (event instanceof InventoryEvent) {
+            return disabledWorlds.contains(((InventoryEvent) event).getView().getPlayer().getWorld().getName());
+        } else if (event instanceof VehicleEvent) {
+            return disabledWorlds.contains(((VehicleEvent) event).getVehicle().getWorld().getName());
+        } else if (event instanceof WeatherEvent) {
+            return disabledWorlds.contains(((WeatherEvent) event).getWorld().getName());
+        } else {
+            return false;
+        }
+    }
 }