Add string component cache

CitizensDev · Dec 22, 2022 · 4c3701a · 4c3701a
1 parent d819ae9
commit 4c3701a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
@@ -89,8 +89,9 @@ public void setPersistent(String key, Object data) {
             }
         }
     };
-    protected Object minecraftComponentCache;
+    protected Object nameComponentCache;
     private String name;
+    protected String nameStringComponentCache;
     private final NPCRegistry registry;
     private final List<String> removedTraits = Lists.newArrayList();
     private final List<Runnable> runnables = Lists.newArrayList();
@@ -103,7 +104,8 @@ protected AbstractNPC(UUID uuid, int id, String name, NPCRegistry registry) {
         this.id = id;
         this.registry = registry;
         this.name = name;
-        minecraftComponentCache = Messaging.minecraftComponentFromRawMessage(name);
+        nameStringComponentCache = Messaging.parseComponents(name);
+        nameComponentCache = Messaging.minecraftComponentFromRawMessage(name);
         CitizensAPI.getTraitFactory().addDefaultTraits(this);
     }
 
@@ -476,7 +478,8 @@ public void setName(String name) {
         NPCRenameEvent event = new NPCRenameEvent(this, this.name, name);
         Bukkit.getPluginManager().callEvent(event);
         this.name = event.getNewName();
-        minecraftComponentCache = Messaging.minecraftComponentFromRawMessage(this.name);
+        nameComponentCache = Messaging.minecraftComponentFromRawMessage(this.name);
+        nameStringComponentCache = Messaging.parseComponents(this.name);
 
         if (!isSpawned())
             return;

diff --git a/src/main/java/net/citizensnpcs/api/util/ItemStorage.java b/src/main/java/net/citizensnpcs/api/util/ItemStorage.java
@@ -308,7 +308,7 @@ private static <T extends ItemMeta> T ensureMeta(ItemStack stack) {
 
     public static ItemStack loadItemStack(DataKey root) {
         Material material = null;
-        if (root.keyExists("type_key")) {
+        if (root.keyExists("type_key") && SpigotUtil.isUsing1_13API()) {
             NamespacedKey key = new NamespacedKey(root.getString("type_namespace", "minecraft"),
                     root.getString("type_key"));
             material = Material.getMaterial(key.getKey().toUpperCase(), false);