fix(tsl): trailing displaying message commas breaking the handler

iGoodie · Jan 1, 2020 · f15a891 · f15a891
1 parent 500e257
commit f15a891
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 
 mod_id=twitchspawn
 mod_group=net.programmer.igoodie
-mod_version=0.4.12
+mod_version=0.4.13
 
 minecraft_version=1.12.2
 forge_version=14.23.3.2655

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/parser/TSLParser.java b/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/parser/TSLParser.java
@@ -11,6 +11,7 @@
 import net.programmer.igoodie.twitchspawn.tslanguage.keyword.TSLEventKeyword;
 import net.programmer.igoodie.twitchspawn.tslanguage.predicate.TSLComparator;
 import net.programmer.igoodie.twitchspawn.tslanguage.predicate.TSLPredicate;
+import net.programmer.igoodie.twitchspawn.util.GsonUtils;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
@@ -69,7 +70,9 @@ public static JsonArray parseMessage(List<String> words) throws TSLSyntaxError {
                 String jsonString = words.get(i + 1);
 
                 try {
-                    return new JsonParser().parse(jsonString).getAsJsonArray();
+                    JsonArray parsedMessage = new JsonParser().parse(jsonString).getAsJsonArray();
+                    GsonUtils.removeInvalidTextComponent(parsedMessage); // <-- Will also remove null elements created by trailing comma chars
+                    return parsedMessage;
 
                 } catch (JsonParseException e) {
                     throw new TSLSyntaxError("Malformed JSON array -> %s", jsonString);