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()