inventory.quantity fix, fix meta

DenizenScript · May 26, 2016 · 22290ff · 22290ff
1 parent bb615ac
commit 22290ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDamagedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDamagedScriptEvent.java
@@ -29,7 +29,7 @@ public class VehicleDamagedScriptEvent extends BukkitScriptEvent implements List
     //
     // @Cancellable true
     //
-    // @Triggers when an entity enters a vehicle.
+    // @Triggers when a vehicle is damaged.
     //
     // @Context
     // <context.vehicle> returns the dEntity of the vehicle.

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDestroyedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDestroyedScriptEvent.java
@@ -28,7 +28,7 @@ public class VehicleDestroyedScriptEvent extends BukkitScriptEvent implements Li
     //
     // @Cancellable true
     //
-    // @Triggers when an entity enters a vehicle.
+    // @Triggers when a vehicle is destroyed.
     //
     // @Context
     // <context.vehicle> returns the dEntity of the vehicle.

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -1776,14 +1776,18 @@ else if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName
         // one is specified, or the combined quantity of all itemstacks
         // if one is not.
         // -->
-        if ((attribute.startsWith("quantity") || attribute.startsWith("qty"))
-                && attribute.hasContext(1)
-                && dItem.matches(attribute.getContext(1))) {
-            return new Element(count // TODO: Handle no-script-entry cases
-                    (dItem.valueOf(attribute.getContext(1),
-                            ((BukkitScriptEntryData) attribute.getScriptEntry().entryData).getPlayer(),
-                            ((BukkitScriptEntryData) attribute.getScriptEntry().entryData).getNPC()).getItemStack(), false))
-                    .getAttribute(attribute.fulfill(1));
+        if (attribute.startsWith("quantity") || attribute.startsWith("qty")) {
+            if (attribute.hasContext(1) && dItem.matches(attribute.getContext(1))) {
+                return new Element(count // TODO: Handle no-script-entry cases
+                        (dItem.valueOf(attribute.getContext(1),
+                                ((BukkitScriptEntryData) attribute.getScriptEntry().entryData).getPlayer(),
+                                ((BukkitScriptEntryData) attribute.getScriptEntry().entryData).getNPC()).getItemStack(), false))
+                        .getAttribute(attribute.fulfill(1));
+            }
+            else {
+                return new Element(count(null, false))
+                        .getAttribute(attribute.fulfill(1));
+            }
         }
 
         // <--[tag]