From 23bb6ac4868e7f7ff958f3757e86e8a962f17320 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 10 Apr 2021 22:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=88=98=E4=BC=A0=E8=BE=93=E7=9A=84?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E7=AE=80=E5=8C=96=E5=92=8C=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E9=97=AE=E9=A2=98=EF=BC=88=E6=9C=AA=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=89=80=E4=BB=A5=E4=BB=8E=E6=9C=AA=E8=A7=A6=E5=8F=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/gametoolfunc.lua  |  4 ++--
 parts/net.lua           |  6 +++---
 parts/player/init.lua   | 14 ++++++--------
 parts/player/player.lua |  6 +++---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua
index 7b9b6d03..c8108d37 100644
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -665,7 +665,7 @@ do--function dumpBasicConfig()
 		"dropFX","moveFX","shakeFX",
 		"text","highCam","nextPos",
 
-		--Not necessary graphic
+		--Unnecessary graphic
 		-- "grid","smooth",
 		-- "lockFX","clearFX","splashFX","atkFX",
 		-- "score",
@@ -675,7 +675,7 @@ do--function dumpBasicConfig()
 		for _,key in next,gameSetting do
 			S[key]=SETTING[key]
 		end
-		return data.encode("string","base64",JSON.encode(S))
+		return JSON.encode(S)
 	end
 end
 do--function resetGameData(args)
diff --git a/parts/net.lua b/parts/net.lua
index 81751760..513e6189 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -346,7 +346,7 @@ function NET.updateWS_play()
 											username=p.username,
 											sid=p.sid,
 											ready=p.ready,
-											conf=p.config,
+											config=p.config,
 										})
 									end
 								end
@@ -359,7 +359,7 @@ function NET.updateWS_play()
 									username=d.username,
 									sid=d.sid,
 									ready=d.ready,
-									conf=d.config,
+									config=d.config,
 								})
 								SCN.socketRead("Join",res.data)
 							end
@@ -395,7 +395,7 @@ function NET.updateWS_play()
 							if tostring(USER.uid)~=d.uid then
 								for i=1,#PLY_NET do
 									if PLY_NET[i].uid==d.uid then
-										PLY_NET[i].conf=d.config
+										PLY_NET[i].config=d.config
 										PLY_NET[i].p:setConf(d.config)
 										return
 									end
diff --git a/parts/player/init.lua b/parts/player/init.lua
index 312aefc3..b4d32efc 100644
--- a/parts/player/init.lua
+++ b/parts/player/init.lua
@@ -234,11 +234,9 @@ local function loadGameEnv(P)--Load gameEnv
 	end
 end
 local function loadRemoteEnv(P,confStr)--Load gameEnv
-	local _,conf=pcall(love.data.decode,"string","base64",confStr)
-	if _ then
-		conf=JSON.decode(conf)
-	else
-		conf={}
+	confStr=JSON.decode(confStr)
+	if not confStr then
+		confStr={}
 		LOG.print("Bad conf from "..P.username.."#"..P.uid)
 	end
 
@@ -249,8 +247,8 @@ local function loadRemoteEnv(P,confStr)--Load gameEnv
 	for k,v in next,gameEnv0 do
 		if GAME.modeEnv[k]~=nil then
 			v=GAME.modeEnv[k]	--Mode setting
-		elseif conf[k]~=nil then
-			v=conf[k]			--Game setting
+		elseif confStr[k]~=nil then
+			v=confStr[k]			--Game setting
 		elseif SETTING[k]~=nil then
 			v=SETTING[k]		--Global setting
 		end
@@ -385,7 +383,7 @@ function PLY.newRemotePlayer(id,mini,data)
 	P.uid=data.uid
 	P.username=data.username
 	P.sid=data.sid
-	loadRemoteEnv(P,data.conf)
+	loadRemoteEnv(P,data.config)
 
 	applyGameEnv(P)
 end
diff --git a/parts/player/player.lua b/parts/player/player.lua
index 89611a5a..455ee57b 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -214,9 +214,9 @@ function Player:setRS(RSname)
 end
 
 function Player:setConf(confStr)
-	local _,conf=pcall(love.data.decode,"string","base64",confStr)
-	if _ then
-		for k,v in next,conf do
+	confStr=JSON.decode(confStr)
+	if confStr then
+		for k,v in next,confStr do
 			if not GAME.modeEnv[k]then
 				self.gameEnv[k]=v
 			end