Skip to content

Commit ef1b72b

Browse files
committed
Make isMarkedContinue a part of the Continuable interface
1 parent 5b70c69 commit ef1b72b

5 files changed

Lines changed: 13 additions & 2 deletions

File tree

src/main/java/org/skriptlang/reflect/syntax/custom/condition/ConditionCheckEvent.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public ConditionCheckEvent(
2121
super(event, self, expressions, matchedPattern, parseResult);
2222
}
2323

24+
@Override
2425
public boolean isMarkedContinue() {
2526
return markedContinue;
2627
}

src/main/java/org/skriptlang/reflect/syntax/custom/effect/EffectTriggerEvent.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public class EffectTriggerEvent extends CustomSyntaxEvent implements Continuable {
1313

1414
public final TriggerItem next;
15-
private boolean sync;
15+
private boolean sync, continued;
1616

1717
public EffectTriggerEvent(
1818
Event event,
@@ -38,11 +38,17 @@ public void setSync(boolean sync) {
3838
this.sync = sync;
3939
}
4040

41+
@Override
42+
public boolean isMarkedContinue() {
43+
return continued;
44+
}
45+
4146
@Override
4247
public void setContinue(boolean b) {
48+
continued = b;
4349
if (isSync())
4450
Skript.warning("Synchronous effects should not be continued. Call 'delay effect' to delay the effect's execution.");
45-
if (b)
51+
if (continued)
4652
TriggerItem.walk(next, getDirectEvent());
4753
}
4854

src/main/java/org/skriptlang/reflect/syntax/custom/event/EventCheckEvent.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public BukkitCustomEvent getDirectEvent() {
2525
return (BukkitCustomEvent) super.getDirectEvent();
2626
}
2727

28+
@Override
2829
public boolean isMarkedContinue() {
2930
return markedContinue;
3031
}

src/main/java/org/skriptlang/reflect/syntax/custom/shared/Continuable.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
public interface Continuable {
44

5+
boolean isMarkedContinue();
6+
57
default void markContinue() {
68
setContinue(true);
79
}

src/main/java/org/skriptlang/reflect/syntax/custom/shared/SyntaxParseEvent.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public Class<? extends Event>[] eventClasses() {
2828
return eventClasses;
2929
}
3030

31+
@Override
3132
public boolean isMarkedContinue() {
3233
return markedContinue;
3334
}

0 commit comments

Comments
 (0)