diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index 25d88fd..ee0d51f 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -72,10 +72,14 @@ export class BattleHandler {
                 }
             });
             this._players.delete(oldplayer);
+            if(ph){
+                this._players.set(newplayer, ph);
+                this._playerids.set(aplayerid + '', newplayer);
+            }
         }
-        if(ph){
-            this._players.set(newplayer, ph);
-            this._playerids.set(aplayerid + '', newplayer);
+        
+        if(!ph){
+            this.addPlayer(newplayer);
         }
     };