diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java index ccbbcc27e1..3000696456 100644 --- 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 ]> // @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 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 index dd5f34db0b..a405448087 100644 --- 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")