a little bit of thread safety, I hope

JsMacros · Jul 24, 2022 · 9924f1c · 9924f1c
1 parent fa7dc2b
commit 9924f1c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/xyz/wagyourtail/jsmacros/jep/language/impl/JEPScriptContext.java b/src/main/java/xyz/wagyourtail/jsmacros/jep/language/impl/JEPScriptContext.java
@@ -68,7 +68,7 @@ public void wrapSleep(int changePriority, SleepRunnable sleep) throws Interrupte
         }
     }
 
-    public void enter() {
+    public synchronized void enter() {
         try {
             if (f.get(getContext()) != null) {
                 throw new IllegalStateException("Thread already set");
@@ -79,7 +79,7 @@ public void enter() {
         }
     }
 
-    public void leave() {
+    public synchronized void leave() {
         try {
             f.set(getContext(), null);
         } catch (IllegalAccessException e) {
@@ -90,7 +90,12 @@ public void leave() {
     @Override
     public synchronized void closeContext() {
         super.closeContext();
-        getContext().close();
+
+        // force on right thread to close
+        try {
+            f.set(getContext(), Thread.currentThread());
+            getContext().close();
+        } catch (Throwable ignored) {}
     }
 
     @Override