From 0d3129bc3f757c75226e1507c6200175cf4bd57c Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Tue, 1 Aug 2023 12:26:08 -0500 Subject: [PATCH] clean: add proper event priorities --- .../hooks/items/HookItemAdder.java | 3 +- .../hmccosmetics/hooks/misc/HookCMI.java | 5 +-- .../hooks/misc/HookLibsDisguises.java | 5 +-- .../hooks/misc/HookPremiumVanish.java | 5 +-- .../hooks/misc/HookSuperVanish.java | 5 +-- .../hooks/worldguard/WGListener.java | 7 ++-- .../listener/PlayerConnectionListener.java | 5 +-- .../listener/PlayerGameListener.java | 33 ++++++++++--------- 8 files changed, 38 insertions(+), 30 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookItemAdder.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookItemAdder.java index 01de28eb..6662b375 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookItemAdder.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookItemAdder.java @@ -7,6 +7,7 @@ import dev.lone.itemsadder.api.CustomStack; import dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent; import org.bukkit.Material; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; @@ -36,7 +37,7 @@ public class HookItemAdder extends Hook { } } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onItemAdderDataLoad(ItemsAdderLoadDataEvent event) { // By default, it will only run once at startup, if hook setting is enabled if (enabled && !Settings.getItemsAdderReloadChange()) return; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookCMI.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookCMI.java index 51ace580..f4d31614 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookCMI.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookCMI.java @@ -7,6 +7,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.CosmeticUsers; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.jetbrains.annotations.NotNull; /** @@ -17,7 +18,7 @@ public class HookCMI extends Hook { super("CMI"); } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerVanish(@NotNull CMIPlayerVanishEvent event) { Player player = event.getPlayer(); CosmeticUser user = CosmeticUsers.getUser(player); @@ -25,7 +26,7 @@ public class HookCMI extends Hook { user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN); } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerShow(@NotNull CMIPlayerUnVanishEvent event) { Player player = event.getPlayer(); CosmeticUser user = CosmeticUsers.getUser(player); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookLibsDisguises.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookLibsDisguises.java index 4f540674..f43444f6 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookLibsDisguises.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookLibsDisguises.java @@ -7,6 +7,7 @@ import me.libraryaddict.disguise.events.DisguiseEvent; import me.libraryaddict.disguise.events.UndisguiseEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.jetbrains.annotations.NotNull; public class HookLibsDisguises extends Hook { @@ -14,7 +15,7 @@ public class HookLibsDisguises extends Hook { super("LibsDisguises"); } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerVanish(@NotNull DisguiseEvent event) { if (!(event.getEntity() instanceof Player player)) return; CosmeticUser user = CosmeticUsers.getUser(player); @@ -22,7 +23,7 @@ public class HookLibsDisguises extends Hook { user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN); } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerShow(@NotNull UndisguiseEvent event) { if (!(event.getEntity() instanceof Player player)) return; CosmeticUser user = CosmeticUsers.getUser(player); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookPremiumVanish.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookPremiumVanish.java index c824da3e..d731d986 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookPremiumVanish.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookPremiumVanish.java @@ -7,6 +7,7 @@ import de.myzelyam.api.vanish.PlayerHideEvent; import de.myzelyam.api.vanish.PlayerShowEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.jetbrains.annotations.NotNull; /** @@ -19,7 +20,7 @@ public class HookPremiumVanish extends Hook { super("PremiumVanish"); } - @EventHandler + @EventHandler(priority = EventPriority.NORMAL) public void onPlayerVanish(@NotNull PlayerHideEvent event) { Player player = event.getPlayer(); CosmeticUser user = CosmeticUsers.getUser(player); @@ -27,7 +28,7 @@ public class HookPremiumVanish extends Hook { user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN); } - @EventHandler + @EventHandler(priority = EventPriority.NORMAL) public void onPlayerShow(@NotNull PlayerShowEvent event) { Player player = event.getPlayer(); CosmeticUser user = CosmeticUsers.getUser(player); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookSuperVanish.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookSuperVanish.java index e8ddec68..bc375811 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookSuperVanish.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookSuperVanish.java @@ -7,6 +7,7 @@ import de.myzelyam.api.vanish.PlayerHideEvent; import de.myzelyam.api.vanish.PlayerShowEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.jetbrains.annotations.NotNull; /** @@ -19,7 +20,7 @@ public class HookSuperVanish extends Hook { super("SuperVanish"); } - @EventHandler + @EventHandler(priority = EventPriority.NORMAL) public void onPlayerVanish(@NotNull PlayerHideEvent event) { Player player = event.getPlayer(); CosmeticUser user = CosmeticUsers.getUser(player); @@ -27,7 +28,7 @@ public class HookSuperVanish extends Hook { user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN); } - @EventHandler + @EventHandler(priority = EventPriority.NORMAL) public void onPlayerShow(@NotNull PlayerShowEvent event) { Player player = event.getPlayer(); CosmeticUser user = CosmeticUsers.getUser(player); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java index 51f9f8e4..dc0eae26 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java @@ -14,6 +14,7 @@ import com.sk89q.worldguard.protection.regions.RegionQuery; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerTeleportEvent; @@ -23,7 +24,7 @@ import org.jetbrains.annotations.NotNull; * Contains {@link com.sk89q.worldguard.WorldGuard WorldGuard} related event listeners */ public class WGListener implements Listener { - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerMove(@NotNull PlayerMoveEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer()); if (user == null) return; @@ -51,7 +52,7 @@ public class WGListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerTeleport(PlayerTeleportEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer()); if (user == null) return; @@ -79,7 +80,7 @@ public class WGListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.NORMAL) public void onPlayerEmote(PlayerEmoteStartEvent event) { Player player = event.getUser().getPlayer(); if (player == null) return; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java index 13d55729..b8bc7476 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java @@ -11,6 +11,7 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; @@ -18,7 +19,7 @@ import org.jetbrains.annotations.NotNull; public class PlayerConnectionListener implements Listener { - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(@NotNull PlayerJoinEvent event) { if (event.getPlayer().isOp() || event.getPlayer().hasPermission("hmccosmetics.notifyupdate")) { if (!HMCCosmeticsPlugin.getLatestVersion().equalsIgnoreCase(HMCCosmeticsPlugin.getInstance().getDescription().getVersion()) && HMCCosmeticsPlugin.getLatestVersion() != null) @@ -47,7 +48,7 @@ public class PlayerConnectionListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerQuit(@NotNull PlayerQuitEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer()); if (user == null) { // Remove any passengers if a user failed to initialize. Bugs can cause this to happen diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java index 05655b36..8a2edc63 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java @@ -35,6 +35,7 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.entity.Pose; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.*; import org.bukkit.event.inventory.InventoryClickEvent; @@ -62,7 +63,7 @@ public class PlayerGameListener implements Listener { //registerTeleportMovement(); } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onPlayerClick(@NotNull InventoryClickEvent event) { // || !event.getClickedInventory().getType().equals(InventoryType.PLAYER) if (event.getClick().isShiftClick()) return; @@ -89,7 +90,7 @@ public class PlayerGameListener implements Listener { MessagesUtil.sendDebugMessages("Event fired, updated cosmetic " + cosmeticSlot); } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onPlayerShift(PlayerToggleSneakEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId()); @@ -104,7 +105,7 @@ public class PlayerGameListener implements Listener { user.leaveWardrobe(); } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onPlayerTeleport(PlayerTeleportEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId()); @@ -134,7 +135,7 @@ public class PlayerGameListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void portalTeleport(PlayerPortalEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId()); @@ -154,7 +155,7 @@ public class PlayerGameListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.NORMAL) public void onPlayerHit(EntityDamageByEntityEvent event) { if (event.isCancelled()) return; Entity entity = event.getEntity(); @@ -164,7 +165,7 @@ public class PlayerGameListener implements Listener { event.setCancelled(true); } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onPlayerDamaged(EntityDamageEvent event) { if (event.isCancelled()) return; if (!(event.getEntity() instanceof Player)) return; @@ -184,7 +185,7 @@ public class PlayerGameListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerLook(PlayerMoveEvent event) { if (event.isCancelled()) return; Player player = event.getPlayer(); @@ -196,7 +197,7 @@ public class PlayerGameListener implements Listener { user.updateCosmetic(CosmeticSlot.BALLOON); } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerPoseChange(EntityPoseChangeEvent event) { if (!(event.getEntity() instanceof Player)) return; Player player = ((Player) event.getEntity()).getPlayer(); @@ -225,7 +226,7 @@ public class PlayerGameListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onPlayerArmorDamage(PlayerItemDamageEvent event) { // Possibly look into cancelling the event, then handling the damage on our own. @@ -259,7 +260,7 @@ public class PlayerGameListener implements Listener { }, 2); } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void playerOffhandSwap(PlayerSwapHandItemsEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId()); if (user == null) return; @@ -275,7 +276,7 @@ public class PlayerGameListener implements Listener { }, 2); } - @EventHandler + @EventHandler(priority = EventPriority.NORMAL) public void onPlayerPickupItem(EntityPickupItemEvent event) { if (!(event.getEntity() instanceof Player)) return; CosmeticUser user = CosmeticUsers.getUser(event.getEntity().getUniqueId()); @@ -283,7 +284,7 @@ public class PlayerGameListener implements Listener { if (user.isInWardrobe()) event.setCancelled(true); } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void playerInvisibility(EntityPotionEffectEvent event) { if (event.isCancelled()) return; if (!event.getModifiedType().equals(PotionEffectType.INVISIBILITY)) return; @@ -301,7 +302,7 @@ public class PlayerGameListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onMainHandSwitch(PlayerItemHeldEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer()); if (user == null) return; @@ -322,7 +323,7 @@ public class PlayerGameListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onPlayerDeath(PlayerDeathEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getEntity()); if (user == null) return; @@ -334,7 +335,7 @@ public class PlayerGameListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onPlayerGamemodeSwitch(PlayerGameModeChangeEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer()); if (user == null) return; @@ -348,7 +349,7 @@ public class PlayerGameListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onPlayerCosemticEquip(PlayerCosmeticPostEquipEvent event) { CosmeticUser user = event.getUser(); if (user.isInWardrobe() && event.getCosmetic().getSlot().equals(CosmeticSlot.BALLOON)) {