Skip to content

Fix expression section claim releasing #8082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
APickledWalrus merged 3 commits into from
Jul 25, 2025
Merged

Fix expression section claim releasing #8082

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7eab0ee
Reset section owner on info change
APickledWalrus Jul 25, 2025
164dfeb
Merge branch 'dev/patch' into patch/section-expression-claiming
sovdeeth Jul 25, 2025
11bd124
Merge branch 'dev/patch' into patch/section-expression-claiming
APickledWalrus Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/main/java/ch/njol/skript/lang/Statement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,23 @@ public abstract class Statement extends TriggerItem implements SyntaxElement {
var iterator = Skript.instance().syntaxRegistry().syntaxes(org.skriptlang.skript.registration.SyntaxRegistry.STATEMENT).iterator();
Section.SectionContext sectionContext = ParserInstance.get().getData(Section.SectionContext.class);
if (node != null) {
var wrappedIterator = new Iterator<>() {
@Override
public boolean hasNext() {
return iterator.hasNext();
}

@Override
public org.skriptlang.skript.registration.SyntaxInfo<? extends Statement> next() {
// it is possible that the section would have been claimed during the attempt to parse the previous info
// as a result, we need to "unclaim" it
sectionContext.owner = null;
return iterator.next();
}
};
statement = sectionContext.modify(node, items, () -> {
//noinspection unchecked,rawtypes
Statement parsed = (Statement) SkriptParser.parse(input, (Iterator) iterator, defaultError);
Statement parsed = (Statement) SkriptParser.parse(input, (Iterator) wrappedIterator, defaultError);
if (parsed != null && !sectionContext.claimed()) {
Skript.error("The line '" + input + "' is a valid statement but cannot function as a section (:) because there is no syntax in the line to manage it.");
return null;
Expand Down