Return AIR not NULL for empty equip slots

DenizenScript · Oct 26, 2015 · 79bb720 · 79bb720
1 parent 21b89e9
commit 79bb720
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/main/java/net/aufdemrand/denizen/NPCCommandHandler.java b/src/main/java/net/aufdemrand/denizen/NPCCommandHandler.java
@@ -409,7 +409,7 @@ public void sleeping(CommandContext args, CommandSender sender, NPC npc) throws
         if (args.hasValueFlag("location")) {
             String[] argsArray = args.getFlag("location").split(",");
             if (argsArray.length != 4) {
-                Messaging.sendError(sender, "Usage: /npc sit --location x,y,z,world");
+                Messaging.sendError(sender, "Usage: /npc sleep --location x,y,z,world");
                 return;
             }
             trait.toSleep(dLocation.valueOf(argsArray[0] + "," + argsArray[1] + "," + argsArray[2] + "," + argsArray[3]));

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityEquipment.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityEquipment.java
@@ -7,6 +7,7 @@
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.objects.properties.Property;
 import net.aufdemrand.denizencore.tags.Attribute;
+import org.bukkit.Material;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;
 
@@ -71,6 +72,10 @@ public String getAttribute(Attribute attribute) {
                 return new dItem(entity.getLivingEntity().getEquipment().getBoots())
                         .getAttribute(attribute.fulfill(2));
             }
+            else {
+                return new dItem(Material.AIR)
+                        .getAttribute(attribute.fulfill(2));
+            }
         }
 
         // <--[tag]
@@ -87,6 +92,10 @@ else if (attribute.startsWith("equipment.chestplate") ||
                 return new dItem(entity.getLivingEntity().getEquipment().getChestplate())
                         .getAttribute(attribute.fulfill(2));
             }
+            else {
+                return new dItem(Material.AIR)
+                        .getAttribute(attribute.fulfill(2));
+            }
         }
 
         // <--[tag]
@@ -103,6 +112,10 @@ else if (attribute.startsWith("equipment.helmet") ||
                 return new dItem(entity.getLivingEntity().getEquipment().getHelmet())
                         .getAttribute(attribute.fulfill(2));
             }
+            else {
+                return new dItem(Material.AIR)
+                        .getAttribute(attribute.fulfill(2));
+            }
         }
 
         // <--[tag]
@@ -119,6 +132,10 @@ else if (attribute.startsWith("equipment.leggings") ||
                 return new dItem(entity.getLivingEntity().getEquipment().getLeggings())
                         .getAttribute(attribute.fulfill(2));
             }
+            else {
+                return new dItem(Material.AIR)
+                        .getAttribute(attribute.fulfill(2));
+            }
         }
 
         // <--[tag]