Try to make PerWorldPlugins faster checking the events

TonimatasDEV · Feb 13, 2024 · 7fc4f32 · 7fc4f32
1 parent 15a58e4
commit 7fc4f32
Showing 1 changed file with 12 additions and 25 deletions.
diff --git a/src/main/java/net/tonimatasdev/perworldplugins/api/PerWorldRegisteredListener.java b/src/main/java/net/tonimatasdev/perworldplugins/api/PerWorldRegisteredListener.java
@@ -32,38 +32,25 @@ 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 BlockEvent) {
-            if (disabledWorlds.contains(((BlockEvent) event).getBlock().getWorld().getName())) return;
-        }
-
-        if (event instanceof EntityEvent) {
+
+        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;
-        }
-
-        if (event instanceof HangingEvent) {
+        } 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;
-        }
-
-        if (event instanceof InventoryEvent) {
+        } else 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) {
+        } else if (event instanceof VehicleEvent) {
             if (disabledWorlds.contains(((VehicleEvent) event).getVehicle().getWorld().getName())) return;
-        }
-
-        if (event instanceof WeatherEvent) {
+        } else if (event instanceof WeatherEvent) {
             if (disabledWorlds.contains(((WeatherEvent) event).getWorld().getName())) return;
         }
 
-        if (event instanceof WorldEvent) {
-            if (disabledWorlds.contains(((WorldEvent) event).getWorld().getName())) return;
-        }
-
         try {
             // Execute the event if it is not blocked.
             super.callEvent(event);