From 2480987f101ec091e3fa1d8efbf0d40ca9769823 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Mon, 24 Oct 2022 14:10:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=9B=B4=E6=96=B0=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4allReady=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/modes/netBattle.lua | 3 ---
 parts/net.lua             | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/parts/modes/netBattle.lua b/parts/modes/netBattle.lua
index 73062090..166ccd01 100644
--- a/parts/modes/netBattle.lua
+++ b/parts/modes/netBattle.lua
@@ -44,8 +44,5 @@ return{
                 N=N+1
             end
         end
-        for i=1,#PLY_ALIVE do
-            MES.new('info',PLY_ALIVE[i].uid.." "..PLY_ALIVE[i].sid,5)
-        end
     end,
 }
diff --git a/parts/net.lua b/parts/net.lua
index b173e507..71e01c15 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -622,6 +622,7 @@ function NET.wsCallBack.room_enter(body)
                 config=p.config,
             }
         end
+        NET.freshRoomAllReady()
     else
         local p=body.data
         NETPLY.add{
@@ -631,7 +632,10 @@ function NET.wsCallBack.room_enter(body)
             config=p.config,
         }
         NET.textBox:push{COLOR.Y,text.joinRoom:repD(USERS.getUsername(p.playerId).."#"..p.playerId.." ")}
-        SFX.play('connected')
+        if not GAME.playing then
+            SFX.play('connected')
+            NET.freshRoomAllReady()
+        end
     end
 
     WAIT.interrupt()