Fix spamming mannequins if weeping angels module is disabled

eccentricdevotion · eccentricdevotion · commit 9583a492c930 · 2025-12-31T18:16:29.000+13:00
diff --git a/src/main/java/me/eccentric_nz/TARDIS/TARDIS.java b/src/main/java/me/eccentric_nz/TARDIS/TARDIS.java
@@ -171,6 +171,7 @@ public class TARDIS extends JavaPlugin {
     private String prefix;
     private CraftingDifficulty craftingDifficulty;
     private WorldManager worldManager;
+    private NamespacedKey headBlockKey;
     private NamespacedKey oldBlockKey;
     private NamespacedKey customBlockKey;
     private NamespacedKey destroyKey;
@@ -253,6 +254,7 @@ public void onDisable() {
     public void onEnable() {
         pm = getServer().getPluginManager();
         plugin = this;
+        headBlockKey = new NamespacedKey(this, "monster_head");
         oldBlockKey = new NamespacedKey(this, "customBlock");
         customBlockKey = new NamespacedKey(this, "custom_block");
         destroyKey = new NamespacedKey(this, "destroy");
@@ -1090,6 +1092,15 @@ public NamespacedKey getOldBlockKey() {
         return oldBlockKey;
     }
 
+    /**
+     * Gets the TARDIS Head Block NamespacedKey
+     *
+     * @return the TARDIS Head Block NamespacedKey
+     */
+    public NamespacedKey getHeadBlockKey() {
+        return headBlockKey;
+    }
+
     /**
      * Gets the TARDIS Custom Block NamespacedKey
      *
diff --git a/src/main/java/me/eccentric_nz/TARDIS/builders/interior/TARDISBuildAbandoned.java b/src/main/java/me/eccentric_nz/TARDIS/builders/interior/TARDISBuildAbandoned.java
@@ -43,7 +43,6 @@
 import me.eccentric_nz.TARDIS.utility.TARDISBlockSetters;
 import me.eccentric_nz.TARDIS.utility.TARDISStaticLocationGetters;
 import me.eccentric_nz.TARDIS.utility.TARDISStaticUtils;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -250,7 +249,7 @@ public void run() {
                     m.setRotation(mannequin.get("rotation").getAsFloat(), 0);
                     m.setBodyYaw(mannequin.get("yaw").getAsFloat());
                     String which = mannequin.get("type").getAsString();
-                    m.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING, which);
+                    m.getPersistentDataContainer().set(plugin.getHeadBlockKey(), PersistentDataType.STRING, which);
                     Skin skin = MannequinSkins.getByName.getOrDefault(which, MannequinSkins.ROMAN);
                     m.setProfile(ResolvableProfile.resolvableProfile().name("").uuid(UUID.randomUUID()).addProperty(new ProfileProperty("textures", skin.value(), skin.signature())).build());
                     m.setSilent(true);
diff --git a/src/main/java/me/eccentric_nz/TARDIS/builders/interior/TARDISBuilderPreview.java b/src/main/java/me/eccentric_nz/TARDIS/builders/interior/TARDISBuilderPreview.java
@@ -38,7 +38,6 @@
 import me.eccentric_nz.TARDIS.utility.TARDISBannerData;
 import me.eccentric_nz.TARDIS.utility.TARDISBlockSetters;
 import me.eccentric_nz.TARDIS.utility.TARDISStaticUtils;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -199,7 +198,7 @@ public void run() {
                     m.setRotation(mannequin.get("rotation").getAsFloat(), 0);
                     m.setBodyYaw(mannequin.get("yaw").getAsFloat());
                     String which = mannequin.get("type").getAsString();
-                    m.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING, which);
+                    m.getPersistentDataContainer().set(plugin.getHeadBlockKey(), PersistentDataType.STRING, which);
                     Skin skin = MannequinSkins.getByName.getOrDefault(which, MannequinSkins.ROMAN);
                     m.setProfile(ResolvableProfile.resolvableProfile().name("").uuid(UUID.randomUUID()).addProperty(new ProfileProperty("textures", skin.value(), skin.signature())).build());
                     m.setSilent(true);
diff --git a/src/main/java/me/eccentric_nz/TARDIS/commands/dev/MannequinCommand.java b/src/main/java/me/eccentric_nz/TARDIS/commands/dev/MannequinCommand.java
@@ -2,10 +2,10 @@
 
 import com.destroystokyo.paper.profile.ProfileProperty;
 import io.papermc.paper.datacomponent.item.ResolvableProfile;
+import me.eccentric_nz.TARDIS.TARDIS;
 import me.eccentric_nz.TARDIS.TARDISConstants;
 import me.eccentric_nz.TARDIS.skins.MannequinSkins;
 import me.eccentric_nz.TARDIS.skins.Skin;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
@@ -27,7 +27,7 @@ public void equip(Player player, String which) {
         float yaw = player.getYaw() + 180f;
         mannequin.setRotation(yaw, 0f);
         mannequin.setBodyYaw(yaw);
-        mannequin.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING, which);
+        mannequin.getPersistentDataContainer().set(TARDIS.plugin.getHeadBlockKey(), PersistentDataType.STRING, which);
         mannequin.setProfile(ResolvableProfile.resolvableProfile().name("").uuid(UUID.randomUUID()).addProperty(new ProfileProperty("textures", skin.value(), skin.signature())).build());
         mannequin.setSilent(true);
         mannequin.setAI(false);
diff --git a/src/main/java/me/eccentric_nz/TARDIS/commands/dev/RomanCommand.java b/src/main/java/me/eccentric_nz/TARDIS/commands/dev/RomanCommand.java
@@ -3,7 +3,6 @@
 import me.eccentric_nz.TARDIS.TARDIS;
 import me.eccentric_nz.TARDIS.enumeration.TardisModule;
 import me.eccentric_nz.TARDIS.utility.TARDISStringUtils;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import me.eccentric_nz.tardisweepingangels.equip.ArmourStandEquipment;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Location;
@@ -30,7 +29,7 @@ public void equip(Player player, String which) {
         ArmorStand as = (ArmorStand) result.getHitEntity();
         if (as != null) {
             as.setArms(false);
-            as.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.INTEGER, 1);
+            as.getPersistentDataContainer().set(TARDIS.plugin.getHeadBlockKey(), PersistentDataType.INTEGER, 1);
             ItemStack head = ItemStack.of(Material.DEAD_BRAIN_CORAL_FAN, 1);
             ItemMeta headMeta = head.getItemMeta();
             headMeta.displayName(Component.text(TARDISStringUtils.capitalise(which) + " Soldier Head"));
diff --git a/src/main/java/me/eccentric_nz/TARDIS/desktop/TARDISFullThemeRunnable.java b/src/main/java/me/eccentric_nz/TARDIS/desktop/TARDISFullThemeRunnable.java
@@ -60,7 +60,6 @@
 import me.eccentric_nz.TARDIS.utility.TARDISStaticLocationGetters;
 import me.eccentric_nz.TARDIS.utility.TARDISStaticUtils;
 import me.eccentric_nz.TARDIS.utility.protection.TARDISProtectionRemover;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import org.bukkit.*;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
@@ -455,7 +454,7 @@ public void run() {
                     m.setRotation(mannequin.get("rotation").getAsFloat(), 0);
                     m.setBodyYaw(mannequin.get("yaw").getAsFloat());
                     String which = mannequin.get("type").getAsString();
-                    m.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING, which);
+                    m.getPersistentDataContainer().set(plugin.getHeadBlockKey(), PersistentDataType.STRING, which);
                     Skin skin = MannequinSkins.getByName.getOrDefault(which, MannequinSkins.ROMAN);
                     m.setProfile(ResolvableProfile.resolvableProfile().name("").uuid(UUID.randomUUID()).addProperty(new ProfileProperty("textures", skin.value(), skin.signature())).build());
                     m.setSilent(true);
diff --git a/src/main/java/me/eccentric_nz/TARDIS/desktop/TARDISThemeRepairRunnable.java b/src/main/java/me/eccentric_nz/TARDIS/desktop/TARDISThemeRepairRunnable.java
@@ -55,7 +55,6 @@
 import me.eccentric_nz.TARDIS.utility.TARDISStaticLocationGetters;
 import me.eccentric_nz.TARDIS.utility.TARDISStaticUtils;
 import me.eccentric_nz.TARDIS.utility.protection.TARDISProtectionRemover;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -343,7 +342,7 @@ public void run() {
                     m.setRotation(mannequin.get("rotation").getAsFloat(), 0);
                     m.setBodyYaw(mannequin.get("yaw").getAsFloat());
                     String which = mannequin.get("type").getAsString();
-                    m.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING, which);
+                    m.getPersistentDataContainer().set(plugin.getHeadBlockKey(), PersistentDataType.STRING, which);
                     Skin skin = MannequinSkins.getByName.getOrDefault(which, MannequinSkins.ROMAN);
                     m.setProfile(ResolvableProfile.resolvableProfile().name("").uuid(UUID.randomUUID()).addProperty(new ProfileProperty("textures", skin.value(), skin.signature())).build());
                     m.setSilent(true);
diff --git a/src/main/java/me/eccentric_nz/TARDIS/lazarus/LazarusUtils.java b/src/main/java/me/eccentric_nz/TARDIS/lazarus/LazarusUtils.java
@@ -18,7 +18,6 @@
 
 import me.eccentric_nz.TARDIS.TARDIS;
 import me.eccentric_nz.TARDIS.skins.*;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import me.eccentric_nz.tardisweepingangels.equip.RemoveEquipment;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -60,7 +59,7 @@ public static void geneticModificationOff(Player player) {
             ItemStack helmet = player.getInventory().getHelmet();
             if (helmet != null && helmet.hasItemMeta()) {
                 ItemMeta im = helmet.getItemMeta();
-                if (im.getPersistentDataContainer().has(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.INTEGER)) {
+                if (im.getPersistentDataContainer().has(TARDIS.plugin.getHeadBlockKey(), PersistentDataType.INTEGER)) {
                     RemoveEquipment.set(player);
                 }
             }
diff --git a/src/main/java/me/eccentric_nz/TARDIS/rooms/TARDISRoomRunnable.java b/src/main/java/me/eccentric_nz/TARDIS/rooms/TARDISRoomRunnable.java
@@ -42,7 +42,6 @@
 import me.eccentric_nz.TARDIS.skins.Skin;
 import me.eccentric_nz.TARDIS.utility.*;
 import me.eccentric_nz.tardischunkgenerator.custombiome.BiomeHelper;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import net.kyori.adventure.text.Component;
 import org.bukkit.*;
 import org.bukkit.block.Block;
@@ -431,7 +430,7 @@ public void run() {
                         m.setRotation(mannequin.get("rotation").getAsFloat(), 0);
                         m.setBodyYaw(mannequin.get("yaw").getAsFloat());
                         String which = mannequin.get("type").getAsString();
-                        m.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING, which);
+                        m.getPersistentDataContainer().set(plugin.getHeadBlockKey(), PersistentDataType.STRING, which);
                         Skin skin = MannequinSkins.getByName.getOrDefault(which, MannequinSkins.ROMAN);
                         m.setProfile(ResolvableProfile.resolvableProfile().name("").uuid(UUID.randomUUID()).addProperty(new ProfileProperty("textures", skin.value(), skin.signature())).build());
                         m.setSilent(true);
diff --git a/src/main/java/me/eccentric_nz/TARDIS/schematic/actions/SchematicPaster.java b/src/main/java/me/eccentric_nz/TARDIS/schematic/actions/SchematicPaster.java
@@ -32,7 +32,6 @@
 import me.eccentric_nz.TARDIS.skins.MannequinSkins;
 import me.eccentric_nz.TARDIS.skins.Skin;
 import me.eccentric_nz.TARDIS.utility.TARDISBannerData;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -151,7 +150,7 @@ public void run() {
                     m.setRotation(mannequin.get("rotation").getAsFloat(), 0);
                     m.setBodyYaw(mannequin.get("yaw").getAsFloat());
                     String which = mannequin.get("type").getAsString();
-                    m.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING, which);
+                    m.getPersistentDataContainer().set(plugin.getHeadBlockKey(), PersistentDataType.STRING, which);
                     Skin skin = MannequinSkins.getByName.getOrDefault(which, MannequinSkins.ROMAN);
                     m.setProfile(ResolvableProfile.resolvableProfile().name("").uuid(UUID.randomUUID()).addProperty(new ProfileProperty("textures", skin.value(), skin.signature())).build());
                     m.setSilent(true);
diff --git a/src/main/java/me/eccentric_nz/TARDIS/schematic/actions/SchematicSave.java b/src/main/java/me/eccentric_nz/TARDIS/schematic/actions/SchematicSave.java
@@ -26,7 +26,6 @@
 import me.eccentric_nz.TARDIS.schematic.getters.DataPackPainting;
 import me.eccentric_nz.TARDIS.utility.ComponentUtils;
 import me.eccentric_nz.TARDIS.utility.TARDISStaticUtils;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import net.kyori.adventure.text.Component;
 import org.bukkit.*;
 import org.bukkit.block.*;
@@ -156,7 +155,7 @@ public boolean act(TARDIS plugin, Player player, String which) {
                                 soldier.add("rel_location", loc);
                                 soldier.addProperty("rotation", mannequin.getYaw());
                                 soldier.addProperty("yaw", mannequin.getBodyYaw());
-                                String type = mannequin.getPersistentDataContainer().getOrDefault(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING, "roman");
+                                String type = mannequin.getPersistentDataContainer().getOrDefault(plugin.getHeadBlockKey(), PersistentDataType.STRING, "roman");
                                 soldier.addProperty("type", type);
                                 if (!mannequin.getEquipment().getItemInMainHand().getType().isAir()) {
                                     soldier.addProperty("hand", mannequin.getMainHand() == MainHand.LEFT ? "left" : "right");
diff --git a/src/main/java/me/eccentric_nz/tardisweepingangels/TARDISWeepingAngels.java b/src/main/java/me/eccentric_nz/tardisweepingangels/TARDISWeepingAngels.java
@@ -349,7 +349,7 @@ private void initKeys(TARDIS plugin) {
         PDC_KEYS.put(Monster.ICE_WARRIOR, WARRIOR);
         ZYGON = new NamespacedKey(plugin, "zygon");
         PDC_KEYS.put(Monster.ZYGON, ZYGON);
-        MONSTER_HEAD = new NamespacedKey(plugin, "monster_head");
+//        MONSTER_HEAD = new NamespacedKey(plugin, "monster_head");
         PersistentDataTypeUUID = new UUIDDataType();
     }
 }
diff --git a/src/main/java/me/eccentric_nz/tardisweepingangels/commands/RemoveCommand.java b/src/main/java/me/eccentric_nz/tardisweepingangels/commands/RemoveCommand.java
@@ -43,7 +43,7 @@ public boolean remove(CommandSender sender) {
             UUID uuid = player.getUniqueId();
             // monster equipped armour stands
             ArmorStand stand = (ArmorStand) FollowerFinder.getEntity(player, EntityType.ARMOR_STAND);
-            if (stand != null && stand.getPersistentDataContainer().has(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.INTEGER)) {
+            if (stand != null && stand.getPersistentDataContainer().has(plugin.getHeadBlockKey(), PersistentDataType.INTEGER)) {
                 stand.remove();
                 return true;
             }
diff --git a/src/main/java/me/eccentric_nz/tardisweepingangels/equip/ArmourEquipper.java b/src/main/java/me/eccentric_nz/tardisweepingangels/equip/ArmourEquipper.java
@@ -16,9 +16,9 @@
  */
 package me.eccentric_nz.tardisweepingangels.equip;
 
+import me.eccentric_nz.TARDIS.TARDIS;
 import me.eccentric_nz.TARDIS.custommodels.keys.*;
 import me.eccentric_nz.TARDIS.utility.ComponentUtils;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import me.eccentric_nz.tardisweepingangels.monsters.cybermen.CyberType;
 import me.eccentric_nz.tardisweepingangels.utils.Monster;
 import net.kyori.adventure.text.Component;
@@ -42,7 +42,7 @@ public NamespacedKey dress(LivingEntity entity, Monster monster) {
         // helmet
         ItemStack head = ItemStack.of(monster.getMaterial());
         ItemMeta headMeta = head.getItemMeta();
-        headMeta.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.INTEGER, 99);
+        headMeta.getPersistentDataContainer().set(TARDIS.plugin.getHeadBlockKey(), PersistentDataType.INTEGER, 99);
         // get armour key once, so random variants (OOD, CLOCKWORK_DROIDS, CYBERMEN) have the same chestplate and leggings
         NamespacedKey armour = monster.getArmourKey();
         // get head variant (CLOCKWORK_DROIDS, CYBERMEN)
@@ -81,7 +81,7 @@ public NamespacedKey dress(LivingEntity entity, Monster monster) {
         bodyComponent.setSlot(EquipmentSlot.CHEST);
         bodyComponent.setModel(armour);
         bodyMeta.setEquippable(bodyComponent);
-        bodyMeta.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.INTEGER, 99);
+        bodyMeta.getPersistentDataContainer().set(TARDIS.plugin.getHeadBlockKey(), PersistentDataType.INTEGER, 99);
         body.setItemMeta(bodyMeta);
         entity.getEquipment().setChestplate(body);
         // leggings
@@ -95,7 +95,7 @@ public NamespacedKey dress(LivingEntity entity, Monster monster) {
         legsComponent.setSlot(EquipmentSlot.LEGS);
         legsComponent.setModel(armour);
         legsMeta.setEquippable(legsComponent);
-        legsMeta.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.INTEGER, 99);
+        legsMeta.getPersistentDataContainer().set(TARDIS.plugin.getHeadBlockKey(), PersistentDataType.INTEGER, 99);
         legs.setItemMeta(legsMeta);
         entity.getEquipment().setLeggings(legs);
         if (!(entity instanceof Player)) {
diff --git a/src/main/java/me/eccentric_nz/tardisweepingangels/equip/ArmourStandEquipment.java b/src/main/java/me/eccentric_nz/tardisweepingangels/equip/ArmourStandEquipment.java
@@ -16,7 +16,7 @@
  */
 package me.eccentric_nz.tardisweepingangels.equip;
 
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
+import me.eccentric_nz.TARDIS.TARDIS;
 import me.eccentric_nz.tardisweepingangels.utils.Monster;
 import net.kyori.adventure.text.Component;
 import org.bukkit.entity.ArmorStand;
@@ -30,7 +30,7 @@ public class ArmourStandEquipment {
     public void setStandEquipment(ArmorStand as, Monster monster, boolean small) {
         as.setSmall(small);
         as.setArms(false);
-        as.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.INTEGER, 1);
+        as.getPersistentDataContainer().set(TARDIS.plugin.getHeadBlockKey(), PersistentDataType.INTEGER, 1);
         ItemStack head = ItemStack.of(monster.getMaterial(), 1);
         ItemMeta headMeta = head.getItemMeta();
         headMeta.displayName(Component.text(monster.getName() + " Head"));
diff --git a/src/main/java/me/eccentric_nz/tardisweepingangels/equip/PlayerUndisguise.java b/src/main/java/me/eccentric_nz/tardisweepingangels/equip/PlayerUndisguise.java
@@ -19,7 +19,6 @@
 import me.eccentric_nz.TARDIS.TARDIS;
 import me.eccentric_nz.TARDIS.enumeration.TardisModule;
 import me.eccentric_nz.TARDIS.utility.ComponentUtils;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -40,7 +39,7 @@ public void onManualUndisguise(InventoryClickEvent event) {
                 if (is != null) {
                     if (is.hasItemMeta()) {
                         ItemMeta im = is.getItemMeta();
-                        if (!im.getPersistentDataContainer().has(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.INTEGER)) {
+                        if (!im.getPersistentDataContainer().has(TARDIS.plugin.getHeadBlockKey(), PersistentDataType.INTEGER)) {
                             if (im.hasDisplayName() && (
                                     ComponentUtils.startsWith(im.displayName(), "Weeping Angel")
                                     || ComponentUtils.startsWith(im.displayName(), "Angel Of Liberty")
diff --git a/src/main/java/me/eccentric_nz/tardisweepingangels/spawner/SpawnerListener.java b/src/main/java/me/eccentric_nz/tardisweepingangels/spawner/SpawnerListener.java
@@ -19,7 +19,6 @@
 import me.eccentric_nz.TARDIS.TARDIS;
 import me.eccentric_nz.TARDIS.enumeration.TardisModule;
 import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngelSpawnEvent;
-import me.eccentric_nz.tardisweepingangels.TARDISWeepingAngels;
 import me.eccentric_nz.tardisweepingangels.equip.Equipper;
 import me.eccentric_nz.tardisweepingangels.utils.Monster;
 import org.bukkit.Material;
@@ -50,9 +49,9 @@ public SpawnerListener(TARDIS plugin) {
     @EventHandler
     public void onSpawn(SpawnerSpawnEvent event) {
         CreatureSpawner spawner = event.getSpawner();
-        if (spawner.getPersistentDataContainer().has(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING)) {
+        if (spawner.getPersistentDataContainer().has(plugin.getHeadBlockKey(), PersistentDataType.STRING)) {
             // set the armour for this entity
-            String m = spawner.getPersistentDataContainer().get(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING);
+            String m = spawner.getPersistentDataContainer().get(plugin.getHeadBlockKey(), PersistentDataType.STRING);
             Monster monster = Monster.valueOf(m);
             plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> {
                 new Equipper(monster, (LivingEntity) event.getEntity(), false).setHelmetAndInvisibility();
@@ -75,7 +74,7 @@ public void onSpawnerClick(PlayerInteractEvent event) {
             return;
         }
         ItemMeta im = is.getItemMeta();
-        if (im == null || !im.getPersistentDataContainer().has(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.INTEGER)) {
+        if (im == null || !im.getPersistentDataContainer().has(plugin.getHeadBlockKey(), PersistentDataType.INTEGER)) {
             return;
         }
         if (!event.getPlayer().isOp()) {
@@ -97,7 +96,7 @@ public void onSpawnerClick(PlayerInteractEvent event) {
     private void setCustomSpawner(Block block, Monster monster) {
         BlockState state = block.getState();
         if (state instanceof CreatureSpawner spawner) {
-            spawner.getPersistentDataContainer().set(TARDISWeepingAngels.MONSTER_HEAD, PersistentDataType.STRING, monster.name());
+            spawner.getPersistentDataContainer().set(plugin.getHeadBlockKey(), PersistentDataType.STRING, monster.name());
             spawner.setSpawnedType(monster.getEntityType());
             spawner.update();
         }
diff --git a/src/main/java/me/eccentric_nz/tardisweepingangels/utils/HeadBuilder.java b/src/main/java/me/eccentric_nz/tardisweepingangels/utils/HeadBuilder.java
diff --git a/src/main/java/me/eccentric_nz/tardisweepingangels/utils/MonsterHeadEquipListener.java b/src/main/java/me/eccentric_nz/tardisweepingangels/utils/MonsterHeadEquipListener.java
diff --git a/src/main/java/me/eccentric_nz/tardisweepingangels/utils/MonsterTargetListener.java b/src/main/java/me/eccentric_nz/tardisweepingangels/utils/MonsterTargetListener.java
