From 0b9006faf34095cb882ae7cbfdbabbf2f8dd742c Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sun, 1 Aug 2021 19:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8F=96=E5=88=B0?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=B2=A1=E6=9C=89=E7=9A=84=E6=97=8B=E8=BD=AC?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BC=9A=E7=9B=B4=E6=8E=A5=E8=93=9D=E5=B1=8F?=
 =?UTF-8?q?=20=E5=8D=87=E7=BA=A7=E6=88=BF=E9=97=B4=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=20=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf.lua                | 2 +-
 parts/player/init.lua   | 7 +++----
 parts/player/player.lua | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/conf.lua b/conf.lua
index b2d1a53e..f0ba4c5d 100644
--- a/conf.lua
+++ b/conf.lua
@@ -3,7 +3,7 @@ VERSION={
 	code=1600,
 	short="V0.16.0",
 	string="Alpha V0.16.0",
-	room="V1.0",
+	room="V1.1",
 	name="空间站 Space station",
 }
 function love.conf(t)
diff --git a/parts/player/init.lua b/parts/player/init.lua
index be44e0e1..d3d87ded 100644
--- a/parts/player/init.lua
+++ b/parts/player/init.lua
@@ -350,9 +350,9 @@ local function applyGameEnv(P)--Finish gameEnv processing
 	if ENV.splashFX==0 then	ENV.splashFX=false	end
 	if ENV.shakeFX==0 then	ENV.shakeFX=false	end
 	if ENV.atkFX==0 then	ENV.atkFX=false		end
-	if ENV.ghost==0 then	ENV.ghost=false	end
-	if ENV.grid==0 then		ENV.grid=false end
-	if ENV.center==0 then	ENV.center=false end
+	if ENV.ghost==0 then	ENV.ghost=false		end
+	if ENV.grid==0 then		ENV.grid=false		end
+	if ENV.center==0 then	ENV.center=false	end
 end
 --------------------------</Libs>--------------------------
 
@@ -408,7 +408,6 @@ function PLY.newRemotePlayer(id,mini,ply)
 	loadRemoteEnv(P,ply.config)
 	applyGameEnv(P)
 end
-
 function PLY.newAIPlayer(id,AIdata,mini)
 	local P=newEmptyPlayer(id,mini)
 	P.type='computer'
diff --git a/parts/player/player.lua b/parts/player/player.lua
index ec4cb1d8..1b70523f 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -222,7 +222,7 @@ function Player:setInvisible(time)--Time in frames
 	end
 end
 function Player:setRS(RSname)
-	self.RS=kickList[RSname]
+	self.RS=kickList[RSname]or kickList.TRS
 end
 
 function Player:getHolePos()--Get a good garbage-line hole position