Fixed a couple bugs in the armor fixer.

rayzr522 · Mar 10, 2018 · 4e2f3eb · 4e2f3eb
1 parent 471a085
commit 4e2f3eb
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/me/rayzr522/ocmfixer/ArmorFixListener.java b/src/main/java/me/rayzr522/ocmfixer/ArmorFixListener.java
@@ -24,6 +24,7 @@ private void cleanInventory(Inventory inv) {
             return;
         }
 
+
         ItemStack[] items = inv.getContents();
         inv.setContents(cleanItems(items));
     }
@@ -50,6 +51,10 @@ private ItemStack removeAttributes(ItemStack item) {
         NbtFactory.NbtCompound root = NbtFactory.fromItemTag(item);
         NbtFactory.NbtList attributes = root.getList("AttributeModifiers", false);
 
+        if (attributes == null) {
+            return item;
+        }
+
         // Dirty check to prevent extra work...
         int origSize = attributes.size();
 
@@ -64,7 +69,11 @@ private ItemStack removeAttributes(ItemStack item) {
 
         // ... so we know if they removed any elements.
         if (attributes.size() != origSize) {
-            root.put("AttributeModifiers", attributes);
+            if (attributes.size() == 0) {
+                root.remove("AttributeModifiers");
+            } else {
+                root.put("AttributeModifiers", attributes);
+            }
             NbtFactory.setItemTag(item, root);
         }