Merge remote-tracking branch 'origin/feat/ppdc-view' into copilot/sub-pr-113

Author: Copilot

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/CloudPlayer.kt

@@ -66,7 +66,7 @@ interface CloudPlayer : Audience, OfflineCloudPlayer {
      */
     fun <R> editPdc(block: PersistentPlayerDataContainer.() -> R): R
 
-    @Deprecated("Use renamed non-suspendable method", ReplaceWith("editPdc(block)"))
+    @Deprecated("Use non-suspending editPdc method instead", ReplaceWith("editPdc(block)"))
     suspend fun <R> withPersistentData(block: PersistentPlayerDataContainer.() -> R): R =
         editPdc(block)
 

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CommonCloudPlayerImpl.kt

@@ -22,6 +22,7 @@ abstract class CommonCloudPlayerImpl(uuid: UUID, override val name: String) :
     protected val persistentDataView = object : PersistentPlayerDataContainerViewImpl() {
         override fun toTagCompound() = ppdcReentrantLock.read { ppdc.tag }
         override fun getTag(key: String) = ppdcReentrantLock.read { ppdc.getTag(key) }
+        override fun snapshotTag() = ppdcReentrantLock.read { super.snapshotTag() }
     }
 
     override val persistentData get() = persistentDataView

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/ppdc/PersistentPlayerDataContainerImpl.kt

@@ -144,7 +144,7 @@ open class PersistentPlayerDataContainerImpl(
     }
 
     override fun snapshot(): PersistentPlayerDataContainerImpl {
-        return PersistentPlayerDataContainerImpl(tag.fast())
+        return PersistentPlayerDataContainerImpl(snapshotTag().fast())
     }
 
     fun fromTagCompound(tag: CompoundBinaryTag) {
@@ -215,20 +215,20 @@ open class PersistentPlayerDataContainerImpl(
     ) {
         if (pathToDeepestParent.isEmpty()) return
 
-        val stack = Stack<Pair<FastCompoundBinaryTag, String>>()
+        val stack = ArrayDeque<Pair<FastCompoundBinaryTag, String>>()
         var current: FastCompoundBinaryTag = root
 
         for (segment in pathToDeepestParent) {
             val childTag = current.getCompound(segment, null) ?: return
             val childFast = childTag as? FastCompoundBinaryTag ?: childTag.fast()
 
             current.put(segment, childFast)
-            stack.push(current to segment)
+            stack.addLast(current to segment)
             current = childFast
         }
 
         while (stack.isNotEmpty()) {
-            val (parent, key) = stack.pop()
+            val (parent, key) = stack.removeLast()
             val child = parent.getCompound(key, null) ?: continue
             if (child.size() == 0) {
                 parent.remove(key)

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/ppdc/PersistentPlayerDataContainerViewImpl.kt

@@ -124,18 +124,27 @@ abstract class PersistentPlayerDataContainerViewImpl : PersistentPlayerDataConta
     }
 
     override fun snapshot(): PersistentPlayerDataContainerViewImpl {
-        val tag = deepCopy(toTagCompound())
-
-        val tagCopy = CompoundBinaryTag.builder()
-            .put(tag)
-            .build()
+        val tagCopy = snapshotTag()
 
         return object : PersistentPlayerDataContainerViewImpl() {
             override fun toTagCompound() = tagCopy
             override fun getTag(key: String) = tagCopy.get(key)
+            override fun snapshotTag() = tagCopy
         }
     }
 
+    /**
+     * Creates a snapshot of the tag compound.
+     * Subclasses should override this method to ensure the snapshot is created
+     * while holding appropriate locks to prevent concurrent modifications.
+     */
+    protected open fun snapshotTag(): CompoundBinaryTag {
+        val tag = deepCopy(toTagCompound())
+        return CompoundBinaryTag.builder()
+            .put(tag)
+            .build()
+    }
+
 
     /**
      * Creates a deep copy of the provided `CompoundBinaryTag` without using recursion.

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/ppdc/TrackingPlayerPersistentDataContainerImpl.kt

@@ -77,6 +77,6 @@ open class TrackingPlayerPersistentDataContainerImpl(
     }
 
     override fun snapshot(): TrackingPlayerPersistentDataContainerImpl {
-        return TrackingPlayerPersistentDataContainerImpl(tag.fast())
+        return TrackingPlayerPersistentDataContainerImpl(snapshotTag().fast())
     }
 }