From b8597d151858dca413c4ada64a9131ddee251d92 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Tue, 18 May 2021 01:45:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88=E7=8E=A9?=
 =?UTF-8?q?=E5=AE=B6=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/net.lua       | 9 ++++++---
 parts/netPlayer.lua | 5 -----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/parts/net.lua b/parts/net.lua
index 813e69e8..07c95e96 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -506,8 +506,9 @@ function NET.updateWS_stream()
 							NET.unlock('wsc_stream')
 							NET.roomInfo.connectingStream=false
 							NET.roomInfo.waitingStream=true
-							netPLY.setConnect(USER.uid)
-							netPLY.freshStreamConn(res.data.connected)
+							for _,uid in next,d.connected do
+								netPLY.setConnect(uid)
+							end
 						elseif res.action==0 then--Game start
 							NET.roomInfo.waitingStream=false
 							NET.roomInfo.start=true
@@ -515,7 +516,9 @@ function NET.updateWS_stream()
 						elseif res.action==1 then--Game finished
 							--?
 						elseif res.action==2 then--Player join
-							netPLY.setConnect(d.uid)
+							if not d.watch then
+								netPLY.setConnect(d.uid)
+							end
 						elseif res.action==3 then--Player leave
 							--?
 						elseif res.action==4 then--Player died
diff --git a/parts/netPlayer.lua b/parts/netPlayer.lua
index ebc17c55..f077bbf8 100644
--- a/parts/netPlayer.lua
+++ b/parts/netPlayer.lua
@@ -133,11 +133,6 @@ function netPLY.setConnect(uid)
 		end
 	end
 end
-function netPLY.freshStreamConn(list)
-	for _,p in next,list do
-		getPLY(p.uid).connected=true
-	end
-end
 function netPLY.resetState()
 	for i=1,#PLY do
 		PLY[i].ready=false