fix: create new instance of source and player positions on each sourc…

…e packet send to avoid race conditions #422
plasmoapp · Oct 12, 2024 · cfef164 · cfef164
1 parent b79a385
commit cfef164
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/server/common/src/main/kotlin/su/plo/voice/server/audio/source/VoiceServerEntitySource.kt b/server/common/src/main/kotlin/su/plo/voice/server/audio/source/VoiceServerEntitySource.kt
@@ -21,10 +21,8 @@ class VoiceServerEntitySource(
 ) : VoiceServerProximitySource<EntitySourceInfo>(voiceServer, addon, UUID.randomUUID(), line, decoderInfo, stereo),
     ServerEntitySource {
 
-    override val position: ServerPos3d = entity.getServerPosition()
-        get() {
-            return entity.getServerPosition(field)
-        }
+    override val position: ServerPos3d
+        get() = entity.getServerPosition()
 
     override val sourceInfo: EntitySourceInfo
         get() = EntitySourceInfo(

diff --git a/server/common/src/main/kotlin/su/plo/voice/server/audio/source/VoiceServerPlayerSource.kt b/server/common/src/main/kotlin/su/plo/voice/server/audio/source/VoiceServerPlayerSource.kt
@@ -21,10 +21,8 @@ class VoiceServerPlayerSource(
 ) : VoiceServerProximitySource<PlayerSourceInfo>(voiceServer, addon, UUID.randomUUID(), line, decoderInfo, stereo),
     ServerPlayerSource {
 
-    private val playerPosition = ServerPos3d()
-
     override val position: ServerPos3d
-        get() = player.instance.getServerPosition(playerPosition)
+        get() = player.instance.getServerPosition()
 
     override val sourceInfo: PlayerSourceInfo
         get() = PlayerSourceInfo(

diff --git a/server/common/src/main/kotlin/su/plo/voice/server/audio/source/VoiceServerProximitySource.kt b/server/common/src/main/kotlin/su/plo/voice/server/audio/source/VoiceServerProximitySource.kt
@@ -27,8 +27,6 @@ abstract class VoiceServerProximitySource<S : SourceInfo>(
     stereo: Boolean
 ) : BaseServerAudioSource<S>(addon, id, serverSourceLine, decoderInfo, stereo), ServerProximitySource<S> {
 
-    private val playerPosition = ServerPos3d()
-
     override var angle: Int = 0
         get() = field
         set(value) {
@@ -50,6 +48,7 @@ abstract class VoiceServerProximitySource<S : SourceInfo>(
         if (dirty.compareAndSet(true, false))
             sendPacket(SourceInfoPacket(sourceInfo), listenersDistance.toShort())
 
+        val playerPosition = ServerPos3d()
         val sourcePosition = position
         val distanceSquared = (listenersDistance * listenersDistance).toDouble()
 
@@ -74,6 +73,7 @@ abstract class VoiceServerProximitySource<S : SourceInfo>(
 
         val listenersDistance = event.distance * DISTANCE_MULTIPLIER
 
+        val playerPosition = ServerPos3d()
         val sourcePosition = position
         val distanceSquared = (listenersDistance * listenersDistance).toDouble()