Fix parse expression not working with optional parts (#1222)

SkriptLang · Jan 19, 2019 · 5e3fa5f · 5e3fa5f
1 parent 883d524
commit 5e3fa5f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -436,7 +436,7 @@ public static ScriptInfo loadScripts(final List<Config> configs) {
 			else
 				Skript.debug("Commands changed but not synced to clients (normal on 1.12 and older)");
 		} else {
-			Skript.debug("Commands unchanged not syncing them to clients");
+			Skript.debug("Commands unchanged, not syncing them to clients");
 		}
 
 		// If task was ran asynchronously, returned stats may be wrong

diff --git a/src/main/java/ch/njol/skript/expressions/ExprParse.java b/src/main/java/ch/njol/skript/expressions/ExprParse.java
@@ -158,10 +158,19 @@ protected Object[] get(final Event e) {
 				assert pattern != null && plurals != null;
 				final ParseResult r = SkriptParser.parse(t, pattern);
 				if (r != null) {
-					assert plurals.length == r.exprs.length;
-					final Object[] os = new Object[r.exprs.length];
-					for (int i = 0; i < os.length; i++)
-						os[i] = plurals[i] ? r.exprs[i].getArray(null) : r.exprs[i].getSingle(null);
+					assert plurals.length == r.exprs.length;					
+					int resultCount = 0;
+					for (int i = 0; i < r.exprs.length; i++) {
+						if (r.exprs[i] != null) // Ignore missing optional parts
+							resultCount++;
+					}
+
+					Object[] os = new Object[resultCount];
+					for (int i = 0, slot = 0; i < r.exprs.length; i++) {
+						if (r.exprs[i] != null)
+							os[slot++] = plurals[i] ? r.exprs[i].getArray(null) : r.exprs[i].getSingle(null);
+					}
+
 					return os;
 				}
 			}