From c2cfb709bb8fe66e25d5185246f35063f7f3ed72 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Tue, 6 Apr 2021 15:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=BD=91=E6=8E=A8=E8=BF=9B=EF=BC=88?=
 =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/net.lua         | 16 ++++++++--------
 parts/player/init.lua |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/parts/net.lua b/parts/net.lua
index c6e26756..7485fda8 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -297,19 +297,19 @@ function NET.updateWS_play()
 								TABLE.clear(PLY_NET)
 								ins(PLY_NET,{
 									uid=USER.uid,
-									name=USER.username,
-									conf=dumpBasicConfig(),
+									username=USER.username,
 									sid=data.sid,
 									ready=data.ready,
+									conf=dumpBasicConfig(),
 								})
 								if data.players then
 									for _,p in next,data.players do
 										ins(PLY_NET,{
-											sid=p.sid,
 											uid=p.uid,
-											name=p.username,
-											conf=p.config,
+											username=p.username,
+											sid=p.sid,
 											ready=p.ready,
+											conf=p.config,
 										})
 									end
 								end
@@ -318,11 +318,11 @@ function NET.updateWS_play()
 							else
 								--Load other players
 								ins(PLY_NET,{
-									sid=data.sid,
 									uid=data.uid,
-									name=data.username,
-									conf=data.config,
+									username=data.username,
+									sid=data.sid,
 									ready=data.ready,
+									conf=data.config,
 								})
 								SCN.socketRead("Join",res.data)
 							end
diff --git a/parts/player/init.lua b/parts/player/init.lua
index 72691a4a..6c39c9be 100644
--- a/parts/player/init.lua
+++ b/parts/player/init.lua
@@ -383,12 +383,12 @@ function PLY.newRemotePlayer(id,mini,data)
 	P.streamProgress=1
 
 	data.p=P
-	P.userName=data.name
 	P.userID=data.uid
+	P.userName=data.username
 	P.subID=data.sid
 	P.ready=data.ready
-
 	loadRemoteEnv(P,data.conf)
+
 	applyGameEnv(P)
 end