safer and more reliable player merging

TaloDev · Oct 28, 2024 · 9af201b · 9af201b
1 parent 515d7c8
commit 9af201b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/services/api/player-api.service.ts b/src/services/api/player-api.service.ts
@@ -190,15 +190,17 @@ export default class PlayerAPIService extends APIService {
     ], (a, b) => a.key === b.key)
 
     player1.setProps(mergedProps)
-    player2.aliases.getItems().forEach((alias) => alias.player = player1)
+    player1.aliases.add(player2.aliases)
+    player2.setProps([])
 
     const saves = await em.getRepository(GameSave).find({ player: player2 })
     saves.forEach((save) => save.player = player1)
 
     const stats = await em.getRepository(PlayerGameStat).find({ player: player2 })
     stats.forEach((stat) => stat.player = player1)
 
-    await em.removeAndFlush(player2)
+    await em.flush()
+    await em.getRepository(Player).nativeDelete(player2)
 
     return {
       status: 200,