fix getName on unspawned entitytag instances

DenizenScript · Jan 11, 2022 · 9b95a2a · 9b95a2a
1 parent 6414972
commit 9b95a2a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -683,7 +683,7 @@ public String getName() {
         if (entity instanceof Player) {
             return entity.getName();
         }
-        String customName = entity.getCustomName();
+        String customName = entity == null ? null : entity.getCustomName();
         if (customName != null) {
             return customName;
         }

diff --git a/...c/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitListProperties.java b/...c/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitListProperties.java
@@ -65,7 +65,12 @@ public static void registerTags() {
                 if (val.startsWith("e@") || val.startsWith("n@")) {
                     EntityTag gotten = object.asType(EntityTag.class, attribute.context);
                     if (gotten != null) {
-                        output.append(gotten.getName());
+                        if (gotten.isValid()) {
+                            output.append(gotten.getName());
+                        }
+                        else {
+                            output.append(gotten.getEntityType().getName());
+                        }
                         handled = true;
                     }
                 }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemEnchantments.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemEnchantments.java
@@ -242,6 +242,7 @@ public void adjust(Mechanism mechanism) {
         // @description
         // Sets the item's enchantments as a map of EnchantmentTags or enchantment names to level.
         // For example: - inventory adjust slot:hand enchantments:sharpness=1
+        // Does not remove existing enchantments, for that use <@link mechanism ItemTag.remove_enchantments>
         // @tags
         // <ItemTag.enchantment_map>
         // -->