ban command: accept duration=0 as infinite

DenizenScript · Dec 15, 2022 · 6cb38c6 · 6cb38c6
1 parent da55b71
commit 6cb38c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java
@@ -812,7 +812,8 @@ public static void register() {
         // @attribute <CuboidTag.intersection[<cuboid>]>
         // @returns CuboidTag
         // @description
-        // Returns the intersection of two intersecting cuboids. Returns null if the cuboids do not intersect.
+        // Returns the intersection of two intersecting cuboids - in other words, returns a cuboid of just the overlap between the two cuboids.
+        // Returns null if the cuboids do not intersect.
         // @example
         // # Notes the intersection as "intersecting_area".
         // - note <cuboid[my_cuboid].intersection[my_second_cuboid]> as:intersecting_area

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BanCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BanCommand.java
@@ -111,7 +111,10 @@ else if (!scriptEntry.hasObject("duration")
                     scriptEntry.addObject("expire", arg.asType(TimeTag.class));
                 }
                 else {
-                    scriptEntry.addObject("expire", new TimeTag(TimeTag.now().millis() + arg.asType(DurationTag.class).getMillis()));
+                    long duration = arg.asType(DurationTag.class).getMillis();
+                    if (duration > 0) { // Explicitly consider infinite duration as null input
+                        scriptEntry.addObject("expire", new TimeTag(TimeTag.now().millis() + duration));
+                    }
                 }
             }
             else if (!scriptEntry.hasObject("source")