Ignore delays from sections that stop execution

Author: APickledWalrus

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

@@ -86,9 +86,16 @@ protected void loadCode(SectionNode sectionNode) {
 		sections.add(this);
 		parser.setCurrentSections(sections);
 
+		Kleenean hadDelayBefore = parser.getHasDelayBefore();
 		try {
 			setTriggerItems(ScriptLoader.loadItems(sectionNode));
 		} finally {
+			if (hadDelayBefore != parser.getHasDelayBefore()) { // the loaded elements caused a delay
+				ExecutionIntent intent = triggerExecutionIntent();
+				if (intent instanceof ExecutionIntent.StopTrigger) { // execution is guaranteed to stop, delay has no effect
+					parser.setHasDelayBefore(hadDelayBefore);
+				}
+			}
 			parser.setCurrentSections(previousSections);
 		}
 	}
@@ -176,12 +183,12 @@ protected final Trigger loadCode(SectionNode sectionNode, String name,
 	 * if the loaded section has a possible or definite delay in it.
 	 */
 	protected void loadOptionalCode(SectionNode sectionNode) {
-		Kleenean hadDelayBefore = getParser().getHasDelayBefore();
+		ParserInstance parser = getParser();
+		Kleenean hadDelayBefore = parser.getHasDelayBefore();
 		loadCode(sectionNode);
-		if (hadDelayBefore.isTrue())
-			return;
-		if (!getParser().getHasDelayBefore().isFalse())
-			getParser().setHasDelayBefore(Kleenean.UNKNOWN);
+		if (!hadDelayBefore.isTrue() && !parser.getHasDelayBefore().isFalse()) {
+			parser.setHasDelayBefore(Kleenean.UNKNOWN);
+		}
 	}
 
 	@Nullable

src/test/skript/tests/regressions/8203-current delay does not consider execution intent.sk

@@ -0,0 +1,7 @@
+test "section delays considering execution intent":
+	parse:
+		set {_var} to true
+		if {_var} is true:
+			wait 1 second
+			stop
+	assert has delay before is false with "delay carried beyond section"