Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.20-lts

Author: rubensworks

resources/changelog/1.19.2-1.0.9.txt

@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.0 or higher.
+
+Fixes:
+* Fix infinite loop not being properly caught, Closes #28
+

src/main/java/org/cyclops/integratedscripting/api/network/IScript.java

@@ -1,5 +1,7 @@
 package org.cyclops.integratedscripting.api.network;
 
+import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
+
 import javax.annotation.Nullable;
 
 /**
@@ -14,7 +16,7 @@ public interface IScript {
      * @return The member, or null if it does not exist.
      */
     @Nullable
-    public IScriptMember getMember(String memberName);
+    public IScriptMember getMember(String memberName) throws EvaluationException;
 
     /**
      * Register a listener that will be invoked when this script gets invalidated.

src/main/java/org/cyclops/integratedscripting/core/network/GraalScript.java

@@ -45,8 +45,13 @@ public GraalScript(Context graalContext, Value graalValue,
 
     @Nullable
     @Override
-    public IScriptMember getMember(String memberName) {
-        Value member = this.graalValue.getMember(memberName);
+    public IScriptMember getMember(String memberName) throws EvaluationException {
+        Value member;
+        try {
+            member = this.graalValue.getMember(memberName);
+        } catch (PolyglotException e) {
+            throw ScriptHelpers.getEvaluationExceptionFactory(disk, path, memberName).createError(e.getMessage());
+        }
         return member == null ? null : new GraalScript(this.graalContext, member, this.addInvalidationListener, this.removeInvalidationListener, disk, path, memberName);
     }