Improve event handling

added priorities to all events, set them to ignore cancelled
APDevTeam · May 26, 2024 · 51f30fc · 51f30fc
1 parent 47a62ae
commit 51f30fc
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/main/java/net/countercraft/movecraft/warfare/features/siege/SiegeLeaderListener.java b/src/main/java/net/countercraft/movecraft/warfare/features/siege/SiegeLeaderListener.java
@@ -26,10 +26,10 @@
 
 
 public class SiegeLeaderListener implements Listener {
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onCraftMovement(CraftPreTranslateEvent event) {
         Craft leaderCraft = event.getCraft();
-        if (!(leaderCraft instanceof PlayerCraft && Config.SiegeEnable && !event.isCancelled())) return;
+        if (!(leaderCraft instanceof PlayerCraft) || !Config.SiegeEnable) return;
         Player player = ((PlayerCraft)leaderCraft).getPilot();
         Siege currentSiege = getSiegeByLeader(player);
         if (currentSiege == null) return;
@@ -49,10 +49,10 @@ public void onCraftMovement(CraftPreTranslateEvent event) {
         event.setCancelled(processCraftMovement(leaderCraft,player,currentSiege,newMaxLocation,newMinLocation));
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onCraftRotation(CraftRotateEvent event) {
         Craft leaderCraft = event.getCraft();
-        if (!(leaderCraft instanceof PlayerCraft && Config.SiegeEnable && !event.isCancelled())) return;
+        if (!(leaderCraft instanceof PlayerCraft) || !Config.SiegeEnable) return;
         Player player = ((PlayerCraft)leaderCraft).getPilot();
         Siege currentSiege = getSiegeByLeader(player);
         if (currentSiege == null) return;
@@ -73,13 +73,13 @@ public void onCraftSink (CraftSinkEvent event) {
         processCraftRemoval(event.getCraft());
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onCraftRelease (CraftReleaseEvent event) {
         processCraftRemoval(event.getCraft());
     }
 
     private void processCraftRemoval(Craft leaderCraft) {
-        if (!(leaderCraft instanceof PlayerCraft && Config.SiegeEnable)) return;
+        if (!(leaderCraft instanceof PlayerCraft) || Config.SiegeEnable) return;
         Player player = ((PlayerCraft)leaderCraft).getPilot();
         Siege currentSiege = getSiegeByLeader(player);
         if (currentSiege == null) return;
@@ -146,5 +146,4 @@ private Siege getSiegeByLeader (@NotNull Player leader) {
         }
         return null;
     }
-
 }