FIx sounds getting stuck on when gui is clicked quickly

TeamOpenIndustry · Nov 29, 2023 · 81f555b · 81f555b
1 parent 6b41b30
commit 81f555b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/cam72cam/immersiverailroading/ImmersiveRailroading.java b/src/main/java/cam72cam/immersiverailroading/ImmersiveRailroading.java
@@ -12,6 +12,7 @@
 import cam72cam.immersiverailroading.multiblock.*;
 import cam72cam.immersiverailroading.net.*;
 import cam72cam.immersiverailroading.registry.DefinitionManager;
+import cam72cam.immersiverailroading.registry.EntityRollingStockDefinition;
 import cam72cam.immersiverailroading.render.SmokeParticle;
 import cam72cam.immersiverailroading.render.block.RailBaseModel;
 import cam72cam.immersiverailroading.render.item.*;
@@ -222,6 +223,7 @@ public void postRender(EntityMoveableRollingStock entity, RenderState state, flo
 				});
 
 				ClientEvents.TICK.subscribe(GuiBuilder::onClientTick);
+				ClientEvents.TICK.subscribe(EntityRollingStockDefinition.ControlSoundsDefinition::cleanupStoppedSounds);
 
 				Particles.SMOKE = Particle.register(SmokeParticle::new, SmokeParticle::renderAll);
 

diff --git a/src/main/java/cam72cam/immersiverailroading/registry/EntityRollingStockDefinition.java b/src/main/java/cam72cam/immersiverailroading/registry/EntityRollingStockDefinition.java
@@ -213,6 +213,7 @@ public static class ControlSoundsDefinition {
         private final Map<UUID, List<ISound>> sounds = new HashMap<>();
         private final Map<UUID, Float> lastMoveSoundValue = new HashMap<>();
         private final Map<UUID, Boolean> wasSoundPressed = new HashMap<>();
+        private static final List<ISound> toStop = new ArrayList<>();
 
         public ControlSoundsDefinition(Identifier engage, Identifier move, Float movePercent, Identifier disengage) {
             this.engage = engage;
@@ -228,6 +229,16 @@ public ControlSoundsDefinition(DataBlock data) {
             disengage = data.getValue("disengage").asIdentifier();
         }
 
+        public static void cleanupStoppedSounds() {
+            if (toStop.isEmpty()) {
+                return;
+            }
+            for (ISound sound : toStop) {
+                sound.stop();
+            }
+            toStop.clear();
+        }
+
         private void createSound(EntityRollingStock stock, Identifier sound, Vec3d pos, boolean repeats) {
             if (sound == null) {
                 return;
@@ -265,9 +276,8 @@ public void effects(EntityRollingStock stock, boolean isPressed, float value, Ve
             } else if (wasPressed && !isPressed) {
                 // Release
                 if (this.sounds.containsKey(stock.getUUID())) {
-                    for (ISound snd : this.sounds.remove(stock.getUUID())) {
-                        snd.stop();
-                    }
+                    // Start and Stop may have happend between ticks, we want to wait till the next tick to stop the sound
+                    toStop.addAll(this.sounds.remove(stock.getUUID()));
                 }
                 createSound(stock, disengage, pos, false);
             } else if (move != null && movePercent != null){