Make listener names consistent and tag withers on proper priority

uskyblock · Dec 30, 2024 · bcf06ab · bcf06ab
1 parent bd879b9
commit bcf06ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/event/GriefEvents.java b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/event/GriefEvents.java
@@ -195,7 +195,7 @@ private void checkWitherLeash(@NotNull Wither shooter, @Nullable String withersI
 
     private @Nullable String getOwningIsland(@NotNull Wither wither) {
         PersistentDataContainer container = wither.getPersistentDataContainer();
-        NamespacedKey key = new NamespacedKey(plugin, WitherTagListener.ENTITY_ORIGIN_METADATA);
+        NamespacedKey key = new NamespacedKey(plugin, WitherTagEvents.ENTITY_ORIGIN_METADATA);
         if (container.has(key, PersistentDataType.STRING)) {
             return container.get(key, PersistentDataType.STRING);
         } else {

diff --git a/...mateskyblock/event/WitherTagListener.java → ...timateskyblock/event/WitherTagEvents.java b/...mateskyblock/event/WitherTagListener.java → ...timateskyblock/event/WitherTagEvents.java
@@ -4,22 +4,23 @@
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Wither;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.persistence.PersistentDataType;
 import us.talabrek.ultimateskyblock.api.IslandInfo;
 import us.talabrek.ultimateskyblock.uSkyBlock;
 
-public class WitherTagListener implements Listener {
+public class WitherTagEvents implements Listener {
 
     static final String ENTITY_ORIGIN_METADATA = "from-island";
     private final uSkyBlock plugin;
 
-    public WitherTagListener(uSkyBlock plugin) {
+    public WitherTagEvents(uSkyBlock plugin) {
         this.plugin = plugin;
     }
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onCreatureSpawn(CreatureSpawnEvent event) {
         if (event.getSpawnReason() == CreatureSpawnEvent.SpawnReason.BUILD_WITHER
             && event.getEntity() instanceof Wither wither) {

diff --git a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/uSkyBlock.java b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/uSkyBlock.java
@@ -325,7 +325,7 @@ public void registerEvents() {
         manager.registerEvents(new PlayerEvents(this), this);
         manager.registerEvents(new MenuEvents(this), this);
         manager.registerEvents(new ExploitEvents(this), this);
-        manager.registerEvents(new WitherTagListener(this), this);
+        manager.registerEvents(new WitherTagEvents(this), this);
         if (getConfig().getBoolean("options.protection.enabled", true)) {
             manager.registerEvents(new GriefEvents(this), this);
             if (getConfig().getBoolean("options.protection.item-drops", true)) {