Adjust SecConditional behavior

Author: APickledWalrus

src/main/java/ch/njol/skript/sections/SecConditional.java

@@ -111,7 +111,7 @@ public boolean init(Expression<?>[] exprs,
 				 *    set {_uh oh} to true
 				 */
 				SecConditional precedingConditional = getPrecedingConditional(triggerItems, null);
-				if (precedingConditional == null || !precedingConditional.multiline) {
+				if (precedingConditional == null || !precedingConditional.multiline || precedingConditional.type == ConditionalType.THEN) {
 					Skript.error("'then' has to placed just after a multiline 'if' or 'else if' section");
 					return false;
 				}
@@ -123,8 +123,6 @@ public boolean init(Expression<?>[] exprs,
 						Skript.error("'else if' has to be placed just after another 'if' or 'else if' section");
 					} else if (type == ConditionalType.ELSE) {
 						Skript.error("'else' has to be placed just after another 'if' or 'else if' section");
-					} else if (type == ConditionalType.THEN) {
-						Skript.error("'then' has to placed just after a multiline 'if' or 'else if' section");
 					}
 					return false;
 				}
@@ -386,27 +384,28 @@ private static List<SecConditional> getPrecedingConditionals(List<TriggerItem> t
 			TriggerItem triggerItem = triggerItems.get(i);
 			if (!(triggerItem instanceof SecConditional conditional))
 				break;
-			if (conditional.type == ConditionalType.ELSE)
-				// if the conditional is an else, break because it belongs to a different condition and ends
-				// this one
-				break;
 			conditionals.add(conditional);
+			if (conditional.type == ConditionalType.IF)
+				// if the conditional is an if, break because it is the root of our conditional
+				break;
 		}
 		return conditionals;
 	}
 
-	private static @Nullable Kleenean getPrecedingShouldDelayAfter(List<TriggerItem> triggerItems) {
+	private @Nullable Kleenean getPrecedingShouldDelayAfter(List<TriggerItem> triggerItems) {
+		if (this.type == ConditionalType.IF)
+			// this is the head, meaning there is no preceding conditional
+			return null;
 		// loop through the triggerItems in reverse order so that we find the most recent items first
 		for (int i = triggerItems.size() - 1; i >= 0; i--) {
 			TriggerItem triggerItem = triggerItems.get(i);
-			if (!(triggerItem instanceof SecConditional conditional))
+			if (!(triggerItem instanceof SecConditional precedingSecConditional))
 				break;
-			if (conditional.type == ConditionalType.ELSE)
-				// if the conditional is an else, break because it belongs to a different condition and ends
-				// this one
+			if (precedingSecConditional.shouldDelayAfter != null)
+				return precedingSecConditional.shouldDelayAfter;
+			if (precedingSecConditional.type == ConditionalType.IF)
+				// this is the head of the conditional, meaning the search failed
 				break;
-			if (conditional.shouldDelayAfter != null)
-				return conditional.shouldDelayAfter;
 		}
 		return null;
 	}

src/test/skript/tests/syntaxes/sections/SecConditional.sk

@@ -179,6 +179,17 @@ test "SecConditional - non-multiline conditional at the end":
 		set {_a} to true
 	assert {_a} is set with "non-multiline 'if' didn't run used at the end of a multiline 'if'"
 
+test "SecConditional - repeating then sections":
+	parse:
+		if:
+			1 is 1
+			2 is 2
+		then:
+			stop
+		then:
+			stop
+	assert last parse logs is "'then' has to placed just after a multiline 'if' or 'else if' section"
+
 test "SecConditional - delay logic 1":
 	assert has delay before is false with "should not have delay at start of test"