From e50f1d9f5050d3b5457f1e7d71a1314633ae1c97 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Wed, 28 Apr 2021 21:36:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=80=E4=BA=9B=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99=E7=9A=84=E8=80=81=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1/=E8=80=81=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/net.lua           |  2 --
 parts/player/player.lua | 13 -------------
 2 files changed, 15 deletions(-)

diff --git a/parts/net.lua b/parts/net.lua
index 55ee0d77..4df33464 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -408,11 +408,9 @@ function NET.updateWS_play()
 								for i=1,#PLY_NET do
 									if PLY_NET[i].uid==d.uid then
 										PLY_NET[i].config=d.config
-										PLY_NET[i].p:setConf(d.config)
 										break
 									end
 								end
-								resetGameData("qn")
 							end
 						elseif res.action==6 then--One ready
 							for i,p in next,PLY_NET do
diff --git a/parts/player/player.lua b/parts/player/player.lua
index e4e0196d..b6aa0702 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -213,19 +213,6 @@ function Player:setRS(RSname)
 	self.RS=kickList[RSname]
 end
 
-function Player:setConf(confStr)
-	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
-		end
-	else
-		LOG.print("Bad conf from "..self.username.."#"..self.uid)
-	end
-end
-
 function Player:getHolePos()--Get a good garbage-line hole position
 	if self.garbageBeneath==0 then
 		return generateLine(self:RND(10))