Skip to content

Commit 527a042

Browse files
committed
requested changes
1 parent 9a29dca commit 527a042

5 files changed

Lines changed: 14 additions & 7 deletions

File tree

src/main/java/ch/njol/skript/effects/EffPotion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ protected void execute(Event event) {
108108
if (timespan == null)
109109
return;
110110
if (timespan.isInfinite()) {
111-
duration = -1;
111+
duration = PotionEffect.INFINITE_DURATION;
112112
} else {
113113
duration = (int) Math.min(timespan.getAs(Timespan.TimePeriod.TICK), Integer.MAX_VALUE);
114114
}

src/main/java/ch/njol/skript/expressions/ExprPotionEffect.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected PotionEffect[] get(final Event e) {
6767
if (this.timespan != null) {
6868
Timespan timespan = this.timespan.getSingle(e);
6969
if (timespan != null) {
70-
ticks = timespan.isInfinite() ? -1 : (int) timespan.getAs(Timespan.TimePeriod.TICK);
70+
ticks = timespan.isInfinite() ? PotionEffect.INFINITE_DURATION : (int) timespan.getAs(Timespan.TimePeriod.TICK);
7171
}
7272
}
7373
return new PotionEffect[]{new PotionEffect(potionEffectType, ticks, tier, ambient, particles)};

src/main/java/ch/njol/skript/expressions/LitEternity.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import ch.njol.skript.doc.Since;
88
import ch.njol.skript.lang.Expression;
99
import ch.njol.skript.lang.ExpressionType;
10-
import ch.njol.skript.lang.SkriptParser;
10+
import ch.njol.skript.lang.SkriptParser.ParseResult;
1111
import ch.njol.skript.lang.util.SimpleLiteral;
1212
import ch.njol.skript.util.Timespan;
1313
import ch.njol.util.Kleenean;
@@ -29,16 +29,15 @@ public class LitEternity extends SimpleLiteral<Timespan> {
2929
Skript.registerExpression(LitEternity.class, Timespan.class, ExpressionType.SIMPLE,
3030
"[an] eternity",
3131
"forever",
32-
"[an] (indefinite|infinite) (duration|timespan)"
33-
);
32+
"[an] (indefinite|infinite) (duration|timespan)");
3433
}
3534

3635
public LitEternity() {
3736
super(new Timespan[]{Timespan.infinite()}, Timespan.class, true);
3837
}
3938

4039
@Override
41-
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
40+
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
4241
return true;
4342
}
4443

src/main/java/ch/njol/skript/util/Timespan.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,20 @@ else if (length == 3 && !hasMs || length == 4) // HH:MM:SS[.ms]
149149
return new Timespan(totalMillis);
150150
}
151151

152+
/**
153+
* Creates a {@link Timespan} from the given {@link Duration}.
154+
* @param duration The duration to convert to a Timespan.
155+
* @return A new Timespan object representing the duration, based on its milliseconds.
156+
*/
152157
@Contract("_ -> new")
153158
public static @NotNull Timespan fromDuration(@NotNull Duration duration) {
154159
return new Timespan(duration.toMillis());
155160
}
156161

162+
/**
163+
* Creates a {@link Timespan} that represents an infinite duration.
164+
* @return A new Timespan object representing an infinite duration.
165+
*/
157166
@Contract(value = " -> new", pure = true)
158167
public static @NotNull Timespan infinite() {
159168
return new Timespan(Long.MAX_VALUE);

src/test/skript/tests/syntaxes/expressions/LitEternity.sk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,3 @@ test "eternity":
2525

2626
set {_a} to a potion effect of speed for an eternity
2727
assert {_a} is infinite with "potion effect was not infinite"
28-
assert {_a} is infinite

0 commit comments

Comments
 (0)