Skip to content

Commit b9af34c

Browse files
committed
fix merge mistakes
1 parent 414cc38 commit b9af34c

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

src/main/java/ch/njol/skript/lang/SkriptParser.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,17 +263,18 @@ public boolean hasTag(String tag) {
263263

264264
/**
265265
* Checks whether the given element is restricted to specific events, and if so, whether the current event is allowed.
266+
* Prints errors.
266267
* @param element The syntax element to check.
267268
* @param parseResult The parse result for error information.
268269
* @return True if the element is allowed in the current event, false otherwise.
269270
*/
270271
private boolean checkRestrictedEvents(SyntaxElement element, ParseResult parseResult) {
271272
if (element instanceof EventRestrictedSyntax eventRestrictedSyntax) {
272273
Class<? extends Event>[] supportedEvents = eventRestrictedSyntax.supportedEvents();
273-
if (!getParser().isCurrentEvent(supportedEvents)) {
274-
Skript.error("'" + parseResult.expr + "' can only be used in " + supportedEventsNames(supportedEvents));
275-
continue;
276-
}
274+
if (!getParser().isCurrentEvent(supportedEvents)) {
275+
Skript.error("'" + parseResult.expr + "' can only be used in " + supportedEventsNames(supportedEvents));
276+
return false;
277+
}
277278
}
278279
return true;
279280
}
@@ -300,11 +301,10 @@ private static String supportedEventsNames(Class<? extends Event>[] supportedEve
300301
* @return True if the element is allowed in the current experiment set, false otherwise.
301302
*/
302303
private boolean checkExperimentalSyntax(SyntaxElement element) {
303-
if (element instanceof ExperimentalSyntax experimentalSyntax) {
304+
if (element instanceof ExperimentalSyntax experimentalSyntax)
304305
return experimentalSyntax.isSatisfiedBy(getParser().getExperimentSet());
305-
}
306306
return true;
307-
}
307+
}
308308

309309
private static @NotNull DefaultExpression<?> getDefaultExpression(ExprInfo exprInfo, String pattern) {
310310
DefaultExpression<?> expr = exprInfo.classes[0].getDefaultExpression();

0 commit comments

Comments
 (0)