From 0efdb7dc338d279b8d26fc057151a6db02892126 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Tue, 30 Mar 2021 10:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=9B=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=94=81=E6=9C=BA=E5=88=B6=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=80=E4=B8=AA=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=90=8D=E5=86=99=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/gametoolfunc.lua |  2 +-
 parts/net.lua          | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua
index d1034d4d..68747e1a 100644
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -1199,7 +1199,7 @@ do
 								SCN.go("net_menu")
 							elseif res.action==0 then--Fetch rooms
 								NET.roomList=res.roomList
-							elseif res.action==2 then--Join room
+							elseif res.action==2 then--Join(create) room
 								loadGame("netBattle",true,true)
 								NET.unlock("enterRoom")
 							elseif res.action==3 then--Leave room
diff --git a/parts/net.lua b/parts/net.lua
index 00d520c1..6ef0bdc2 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -83,15 +83,17 @@ function NET.freshRoom()
 	})
 end
 function NET.createRoom()
-	WS.send("play",JSON.encode{
-		action=1,
-		data={
-			type="classic",
-			name=(USER.name or"???").."'s room",
-			password=nil,
-			conf=dumpBasicConfig(),
-		}
-	})
+	if NET.lock("enterRoom")then
+		WS.send("play",JSON.encode{
+			action=1,
+			data={
+				type="classic",
+				name=(USER.name or"???").."'s room",
+				password=nil,
+				config=dumpBasicConfig(),
+			}
+		})
+	end
 end
 function NET.enterRoom(roomID,password)
 	if NET.lock("enterRoom")then
@@ -99,7 +101,7 @@ function NET.enterRoom(roomID,password)
 			action=2,
 			data={
 				rid=roomID,
-				conf=dumpBasicConfig(),
+				config=dumpBasicConfig(),
 				password=password,
 			}
 		})