bug fix: double join check

dapucita · Jan 23, 2021 · d6b7b01 · d6b7b01
1 parent 9da3d18
commit d6b7b01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/core/controller/RoomTools.ts b/core/controller/RoomTools.ts
@@ -1,7 +1,7 @@
-import { PlayerObject } from "../model/GameObject/PlayerObject";
-import { convertTeamID2Name, TeamID } from "../model/GameObject/TeamID";
 import * as Tst from "./Translator";
 import * as LangRes from "../resources/strings";
+import { PlayerObject } from "../model/GameObject/PlayerObject";
+import { convertTeamID2Name, TeamID } from "../model/GameObject/TeamID";
 
 export function setDefaultStadiums(): void {
     // set stadium maps as default setting

diff --git a/core/controller/events/onPlayerJoin.ts b/core/controller/events/onPlayerJoin.ts
@@ -64,16 +64,16 @@ export async function onPlayerJoinListener(player: PlayerObject): Promise<void>
             // window.room.clearBan(player.id); //useless cuz banned player in haxball couldn't make join-event.
         }
     }
-
+    
     // if this player has already joinned by other connection
-    window.playerList.forEach((eachPlayer: Player) => {
-        if (eachPlayer.conn == player.conn) {
+    for (let eachPlayer of window.playerList.values()) {
+        if(eachPlayer.conn === player.conn) {
             window.logger.i(`${player.name}#${player.id} was joined but kicked for double joinning. (origin:${eachPlayer.name}#${eachPlayer.id},conn:${player.conn})`);
             window.room.kickPlayer(player.id, Tst.maketext(LangRes.onJoin.doubleJoinningKick, placeholderJoin), false); // kick
-            window.room.sendAnnouncement(Tst.maketext(LangRes.onJoin.doubleJoinningMsg, placeholderJoin), null, 0xFF0000, "normal", 0); // notify
+            //window.room.sendAnnouncement(Tst.maketext(LangRes.onJoin.doubleJoinningMsg, placeholderJoin), null, 0xFF0000, "normal", 0); // notify
             return; // exit from this join event
         }
-    });
+    }
 
     // add the player who joined into playerList by creating class instance
     let existPlayerData = await getPlayerDataFromDB(player.auth);