Fix NPE with expr-%number% where the number is higher than the pattern allows

Author: TPGamesNL

src/main/java/com/btk5h/skriptmirror/skript/custom/ExprExpression.java

@@ -20,6 +20,7 @@
 import com.btk5h.skriptmirror.skript.custom.expression.ExpressionGetEvent;
 import com.btk5h.skriptmirror.util.JavaUtil;
 import org.bukkit.event.Event;
+import org.eclipse.jdt.annotation.Nullable;
 
 import java.util.Iterator;
 
@@ -80,6 +81,7 @@ public T[] getAll(Event e) {
     return Converters.convertArray(expr.getAll(e), types, superType);
   }
 
+  @Nullable
   Expression<?> getExpression(Event e) {
     Expression<?>[] expressions = ((CustomSyntaxEvent) e).getExpressions();
     if (index < expressions.length) {
@@ -169,7 +171,6 @@ public String toString(Event e, boolean debug) {
     return "expression " + (index + 1);
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed,
                       SkriptParser.ParseResult parseResult) {

src/main/java/com/btk5h/skriptmirror/skript/custom/ExprRawExpression.java

@@ -23,9 +23,12 @@ public class ExprRawExpression extends SimpleExpression<Expression> {
   protected Expression[] get(Event e) {
     Expression<?> expr = this.expr;
     if (expr instanceof ExprExpression && e instanceof CustomSyntaxEvent) {
-      expr = ((ExprExpression) expr).getExpression(e).getSource();
+      expr = ((ExprExpression) expr).getExpression(e);
+      if (expr == null)
+        return null;
+      expr = expr.getSource();
     }
-    return new Expression[]{expr};
+    return new Expression[] {expr};
   }
 
   @Override
@@ -48,10 +51,13 @@ public void change(Event event, Object[] delta, Changer.ChangeMode changeMode) {
     if (!(expr instanceof ExprExpression && event instanceof CustomSyntaxEvent))
       return;
 
-    Expression<?> expr = ((ExprExpression<?>) this.expr).getExpression(event).getSource();
+    Expression<?> expr = ((ExprExpression<?>) this.expr).getExpression(event);
+    if (expr == null)
+      return;
+    Expression<?> source = expr.getSource();
 
     event = ((WrappedEvent) event).getEvent();
-    expr.change(event, delta, changeMode);
+    source.change(event, delta, changeMode);
   }
 
   @Override