Fix some weirdness

- give command debugging wrong - functions defined wrong - util script minor messups - durability mech failing to adjust material data
DenizenScript · Oct 19, 2014 · 24bbf3c · 24bbf3c
1 parent 0470b48
commit 24bbf3c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemDurability.java b/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemDurability.java
@@ -88,6 +88,7 @@ public void adjust(Mechanism mechanism) {
         // -->
 
         if (mechanism.matches("durability") && mechanism.requireInteger()) {
+            item.getItemStack().getData().setData((byte)mechanism.getValue().asInt());
             item.setDurability((short) mechanism.getValue().asInt());
         }
     }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptRegistry.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptRegistry.java
@@ -114,7 +114,7 @@ public static void addYamlScriptContainer(net.aufdemrand.denizencore.utilities.Y
      * @param yaml_script  the FileConfiguration containing the script
      *
      */
-    public static void removeYamlScriptContainer(FileConfiguration yaml_script) {
+    public static void removeYamlScriptContainer(YamlConfiguration yaml_script) {
         outside_scripts.remove(yaml_script);
         DenizenCore.reloadScripts();
     }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/item/GiveCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/item/GiveCommand.java
@@ -47,7 +47,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
                     && arg.matchesPrefix("q", "qty", "quantity")
                     && arg.matchesPrimitive(aH.PrimitiveType.Double)) {
                 scriptEntry.addObject("qty", arg.asElement());
-                scriptEntry.addObject("set_quantity", Element.TRUE);
+                scriptEntry.addObject("set_quantity",  new Element(true));
             }
 
             else if (!scriptEntry.hasObject("type")
@@ -60,16 +60,17 @@ else if (!scriptEntry.hasObject("type")
 
             else if (!scriptEntry.hasObject("engrave")
                         && arg.matches("engrave"))
-                scriptEntry.addObject("engrave", Element.TRUE);
+                scriptEntry.addObject("engrave",  new Element(true));
 
             else if (!scriptEntry.hasObject("unlimit_stack_size")
                     && arg.matches("unlimit_stack_size"))
-                scriptEntry.addObject("unlimit_stack_size", Element.TRUE);
+                scriptEntry.addObject("unlimit_stack_size", new Element(true));
 
             else if (!scriptEntry.hasObject("items")
                         && !scriptEntry.hasObject("type")
-                        && arg.matchesArgumentList(dItem.class))
+                        && arg.matchesArgumentList(dItem.class)) {
                 scriptEntry.addObject("items", dList.valueOf(arg.raw_value.replace("item:", "")).filter(dItem.class, scriptEntry));
+            }
 
             else if (!scriptEntry.hasObject("inventory")
                         && arg.matchesPrefix("t", "to")
@@ -81,11 +82,14 @@ else if (!scriptEntry.hasObject("slot")
                     && arg.matchesPrimitive(aH.PrimitiveType.Integer))
                 scriptEntry.addObject("slot", arg.asElement());
 
+            else
+                arg.reportUnhandled();
+
         }
 
         scriptEntry.defaultObject("type", Type.ITEM)
-                .defaultObject("engrave", Element.FALSE)
-                .defaultObject("unlimit_stack_size", Element.FALSE)
+                .defaultObject("engrave",  new Element(false))
+                .defaultObject("unlimit_stack_size", new Element(false))
                 .defaultObject("qty", new Element(1))
                 .defaultObject("slot", new Element(1));
 

diff --git a/src/main/resources/util.dscript b/src/main/resources/util.dscript
@@ -5,7 +5,7 @@ _util_dtime_command:
     type: command
     name: dtime
     description: (Deprecated) Changes the server time.
-    usage: /dtime <time>
+    usage: /dtime <&lt>time<&gt>
     allowed help:
     - determine <player.is_op>
     script:
@@ -76,7 +76,7 @@ Load Tester:
     type: command
     name: testload
     description: Tests server load.
-    usage: /testload <power>
+    usage: /testload <&lt>power<&gt>
     allowed help:
     - determine <player.is_op>
     script:
@@ -117,5 +117,5 @@ Load Tester:
     - determine fulfilled
 
 
-  test:
-  - flag server stress_test_counter:++
+    test:
+    - flag server stress_test_counter:++