Merge branch 'master' into port/neoforge

Author: ishland

gradle.properties

@@ -12,6 +12,6 @@ forge_version=21.11.0-beta
 yarn_mappings_patch_neoforge_version=1.21+build.4
 
 # Mod Properties
-mod_version = 1.1.12
+mod_version = 1.1.13
 maven_group = com.ishland
 archives_base_name = rsls-neoforge

src/main/java/com/ishland/fabric/rsls/mixin/MixinSoundExecutor.java

@@ -9,12 +9,22 @@
 @Mixin(SoundExecutor.class)
 public abstract class MixinSoundExecutor extends ThreadExecutor<Runnable> {
 
-    @Shadow private volatile boolean stopped;
-
-    @Shadow private Thread thread;
-
     protected MixinSoundExecutor(String name) {
         super(name);
     }
 
+    @Override
+    public boolean runTask() {
+        synchronized (this) {
+            return super.runTask();
+        }
+    }
+
+    @Override
+    protected void cancelTasks() {
+        synchronized (this) {
+            super.cancelTasks();
+        }
+    }
+
 }