fix soul not able to create when player leave server on death

Author: makeevrserg

docker-compose.yml

@@ -14,7 +14,7 @@ services:
       # Forge --------------------
       TYPE: NEOFORGE
       VERSION: "1.21.1"
-      NEOFORGE_VERSION: "21.1.129"
+      NEOFORGE_VERSION: "21.1.209"
       # Paper --------------------
       #TYPE: PAPER
       #VERSION: 1.21.8

gradle.properties

@@ -13,7 +13,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=SoulKeeper
 makeevrserg.project.group=ru.astrainteractive.soulkeeper
-makeevrserg.project.version.string=1.2.6
+makeevrserg.project.version.string=1.2.7
 makeevrserg.project.description=Keep your items after death
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 makeevrserg.project.url=https://github.com/Astra-Interactive/SoulKeeper

modules/event-neoforge/src/main/kotlin/ru/astrainteractive/soulkeeper/module/event/event/ForgeSoulEvents.kt

@@ -21,6 +21,7 @@ import ru.astrainteractive.astralibs.server.location.Location
 import ru.astrainteractive.astralibs.server.player.OnlineMinecraftPlayer
 import ru.astrainteractive.astralibs.server.util.asLocatable
 import ru.astrainteractive.astralibs.server.util.asOnlineMinecraftPlayer
+import ru.astrainteractive.astralibs.server.util.toPlain
 import ru.astrainteractive.klibs.kstorage.api.CachedKrate
 import ru.astrainteractive.klibs.kstorage.util.getValue
 import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers
@@ -87,16 +88,16 @@ internal class ForgeSoulEvents(
     }
 
     private suspend fun createSoul(
-        onlineMinecraftPlayer: OnlineMinecraftPlayer,
+        serverPlayer: ServerPlayer,
         droppedXp: Int?,
         soulItems: List<ItemStack>?,
         location: Location,
         dimension: ResourceKey<Level>
     ) {
         val soul = DefaultSoul(
             exp = droppedXp ?: 0,
-            ownerUUID = onlineMinecraftPlayer.uuid,
-            ownerLastName = onlineMinecraftPlayer.name,
+            ownerUUID = serverPlayer.uuid,
+            ownerLastName = serverPlayer.name.toPlain(),
             createdAt = Instant.now(),
             isFree = soulsConfig.soulFreeAfter == 0.seconds,
             location = when (dimension) {
@@ -116,20 +117,19 @@ internal class ForgeSoulEvents(
 
     @Suppress("LongMethod")
     private suspend fun createOrUpdateSoul(
-        onlineMinecraftPlayer: OnlineMinecraftPlayer,
         serverPlayer: ServerPlayer,
         droppedXp: Int?,
         soulItems: List<ItemStack>?
     ) {
         mutex.withLock {
-            val location = onlineMinecraftPlayer
+            val location = serverPlayer
                 .asLocatable()
                 .getLocation()
 
             val existingSoul = soulsDao.getSoulsNear(location, 1)
                 .getOrNull()
                 .orEmpty()
-                .firstOrNull { soul -> soul.ownerUUID == onlineMinecraftPlayer.uuid }
+                .firstOrNull { soul -> soul.ownerUUID == serverPlayer.uuid }
                 ?.let { dbSoul -> soulsDao.toItemDatabaseSoul(dbSoul) }
                 ?.getOrNull()
 
@@ -142,15 +142,15 @@ internal class ForgeSoulEvents(
             } else {
                 createSoul(
                     location = location,
-                    onlineMinecraftPlayer = onlineMinecraftPlayer,
+                    serverPlayer = serverPlayer,
                     droppedXp = droppedXp,
                     soulItems = soulItems,
                     dimension = serverPlayer.level().dimension()
                 )
             }
             spawnSoulEffects(
                 location = location,
-                onlineMinecraftPlayer = onlineMinecraftPlayer
+                onlineMinecraftPlayer = serverPlayer.asOnlineMinecraftPlayer()
             )
         }
     }
@@ -160,7 +160,6 @@ internal class ForgeSoulEvents(
         .onEach { event ->
             val serverPlayer = event.entity.tryCast<ServerPlayer>() ?: return@onEach
             val keepLevel = event.entity.level().gameRules.getBoolean(GameRules.RULE_KEEPINVENTORY)
-            val onlineMinecraftPlayer = serverPlayer.asOnlineMinecraftPlayer()
 
             val droppedXp = when {
                 keepLevel -> 0
@@ -175,7 +174,6 @@ internal class ForgeSoulEvents(
             event.droppedExperience = 0
 
             createOrUpdateSoul(
-                onlineMinecraftPlayer = onlineMinecraftPlayer,
                 serverPlayer = serverPlayer,
                 droppedXp = droppedXp,
                 soulItems = null
@@ -189,7 +187,6 @@ internal class ForgeSoulEvents(
             info { "#livingDropsEvent ${event.drops.size} ${event.drops}" }
             val serverPlayer = event.entity.tryCast<ServerPlayer>() ?: return@onEach
             val keepInventory = event.entity.level().gameRules.getBoolean(GameRules.RULE_KEEPINVENTORY)
-            val onlineMinecraftPlayer = serverPlayer.asOnlineMinecraftPlayer()
 
             val soulItems = when {
                 keepInventory -> emptyList()
@@ -200,7 +197,6 @@ internal class ForgeSoulEvents(
             event.drops.clear()
 
             createOrUpdateSoul(
-                onlineMinecraftPlayer = onlineMinecraftPlayer,
                 serverPlayer = serverPlayer,
                 droppedXp = null,
                 soulItems = soulItems