fix mistake in new "reset:<duration>" args for time/weather

DenizenScript · Dec 9, 2019 · 10fcdf6 · 10fcdf6
1 parent 568d767
commit 10fcdf6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/TimeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/TimeCommand.java
@@ -81,6 +81,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
             }
             else if (!scriptEntry.hasObject("value")
                     && !scriptEntry.hasObject("reset")
+                    && !arg.matchesPrefix("reset")
                     && arg.matchesArgumentType(DurationTag.class)) {
                 scriptEntry.addObject("value", arg.asType(DurationTag.class));
             }
@@ -93,7 +94,7 @@ else if (!scriptEntry.hasObject("freeze")
                     && arg.matches("freeze")) {
                 scriptEntry.addObject("freeze", new ElementTag(true));
             }
-            else if (!scriptEntry.hasObject("value")
+            else if (!scriptEntry.hasObject("reset_after")
                     && arg.matchesPrefix("reset")
                     && arg.matchesArgumentType(DurationTag.class)) {
                 scriptEntry.addObject("reset_after", arg.asType(DurationTag.class));

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WeatherCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WeatherCommand.java
@@ -47,15 +47,15 @@ public class WeatherCommand extends AbstractCommand {
     // <WorldTag.thunder_duration>
     //
     // @Usage
-    // Use to makes the weather sunny
+    // Use to make the weather sunny.
     // - weather sunny
     //
     // @Usage
-    // Use to makes the weather storm in world "cookies"
+    // Use to start a storm in world "cookies".
     // - weather storm cookies
     //
     // @Usage
-    // Use to make the weather storm for the attached player.
+    // Use to start a storm that's only visible to the attached player.
     // - weather player storm
     //
     // @Usage
@@ -89,7 +89,7 @@ else if (!scriptEntry.hasObject("value")
                     && arg.matchesEnum(Value.values())) {
                 scriptEntry.addObject("value", arg.asElement());
             }
-            else if (!scriptEntry.hasObject("value")
+            else if (!scriptEntry.hasObject("reset_after")
                     && arg.matchesPrefix("reset")
                     && arg.matchesArgumentType(DurationTag.class)) {
                 scriptEntry.addObject("reset_after", arg.asType(DurationTag.class));