From 4a572f06a668424ee3f61908914f4b1c45e944cd Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <mcmonkey4eva@hotmail.com>
Date: Sat, 4 Apr 2015 17:25:19 -0700
Subject: [PATCH] Handle equipment better

---
 .../java/net/aufdemrand/denizen/objects/dEntity.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
index 5f8dfb6eb1..85fcf97f88 100644
--- 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;
     }
 
     /**