Fix item book format, item skull_skin for invalid input

Don't retain invalid skin data
DenizenScript · Aug 2, 2020 · 0123fe7 · 0123fe7
1 parent 4ce3e1a
commit 0123fe7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBook.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBook.java
@@ -180,7 +180,7 @@ public MapTag getBookMap() {
         BookMeta bookInfo = (BookMeta) item.getItemMeta();
         if (item.getItemStack().getType().equals(Material.WRITTEN_BOOK) && bookInfo.hasAuthor() && bookInfo.hasTitle()) {
             outMap.putObject("author", new ElementTag(bookInfo.getAuthor()));
-            outMap.putObject("author", new ElementTag(bookInfo.getTitle()));
+            outMap.putObject("title", new ElementTag(bookInfo.getTitle()));
         }
         if (bookInfo.hasPages()) {
             List<BaseComponent[]> pages = bookInfo.spigot().getPages();

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSkullskin.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSkullskin.java
@@ -172,6 +172,9 @@ public void adjust(Mechanism mechanism) {
             if (texture != null) { // Ensure we didn't get overwritten
                 profile.setTexture(texture);
             }
+            if (profile.getTexture() == null) {
+                return; // Can't set a skull skin to nothing.
+            }
             item.setItemStack(NMSHandler.getItemHelper().setSkullSkin(item.getItemStack(), profile));
         }
     }