Treat configurationsections as null values when loading

CitizensDev · Mar 23, 2024 · fbbdb84 · fbbdb84
1 parent 72ca7fe
commit fbbdb84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
@@ -339,18 +339,11 @@ public void load(final DataKey root) {
             keys.remove(locationKey);
         }
         for (DataKey key : keys) {
-            if (key.name().equals("speech"))
-                continue;
-
             loadTraitFromKey(key);
         }
     }
 
     private void loadTraitFromKey(DataKey traitKey) {
-        if (traitKey.name().equals("smoothrotationtrait")) {
-            traitKey.removeKey("");
-            return;
-        }
         Class<? extends Trait> clazz = CitizensAPI.getTraitFactory().getTraitClass(traitKey.name());
         Trait trait;
         if (hasTrait(clazz)) {

diff --git a/src/main/java/net/citizensnpcs/api/util/YamlStorage.java b/src/main/java/net/citizensnpcs/api/util/YamlStorage.java
@@ -86,7 +86,8 @@ public boolean load() {
     }
 
     private boolean pathExists(String key) {
-        return config.get(key) != null;
+        Object object = config.get(key);
+        return object != null && !(object instanceof ConfigurationSection);
     }
 
     @Override