Handle equipment better

DenizenScript · Apr 5, 2015 · 4a572f0 · 4a572f0
1 parent eed3fb5
commit 4a572f0
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -620,7 +620,15 @@ public String getName() {
      */
 
     public dList getEquipment() {
-        return getInventory().getEquipment();
+        if (isCitizensNPC() || isPlayer()) {
+            return getInventory().getEquipment();
+        }
+        ItemStack[] equipment = getLivingEntity().getEquipment().getArmorContents();
+        dList equipmentList = new dList();
+        for (ItemStack item : equipment) {
+            equipmentList.add(new dItem(item).identify());
+        }
+        return equipmentList;
     }
 
     /**