From 90dcb9ee1a3f52a7bbe5c4432f010baa40f63365 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Sun, 26 Nov 2023 21:40:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=89=E7=8E=A9=E5=AE=B6?=
 =?UTF-8?q?=E7=9A=84=5Fget=5Fnew=5Fblock=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/player/player.lua | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/parts/player/player.lua b/parts/player/player.lua
index 5fe019ea..fdbe35de 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -1279,17 +1279,11 @@ function Player:_try_physical_hold_with(H)
         end
     end
 end
-function Player:_get_new_block(C)
-    local hb=self:getBlock(C.id)
-    hb.color=C.color
-    hb.name=C.name
-    return hb
-end
 function Player:hold_norm(ifpre)
     local ENV=self.gameEnv
     if #self.holdQueue<ENV.holdCount and self.nextQueue[1] then-- Skip
         local C=self.cur
-        ins(self.holdQueue,self:getBlock(C.id,C.name,C.color))
+        ins(self.holdQueue,self:_getBlock(C.id,C.name,C.color))
 
         local t=self.holdTime
         self:_popNext(true)
@@ -1307,7 +1301,7 @@ function Player:hold_norm(ifpre)
 
             self.spinLast=false
 
-            ins(self.holdQueue,self:_get_new_block(C))
+            ins(self.holdQueue,self:_getBlock(C.id,C.name,C.color))
             self.cur=rem(self.holdQueue,1)
 
             self.curX,self.curY=x,y
@@ -1315,7 +1309,7 @@ function Player:hold_norm(ifpre)
             self.spinLast=false
 
             if C then
-                ins(self.holdQueue,self:_get_new_block(C))
+                ins(self.holdQueue,self:_getBlock(C.id,C.name,C.color))
                 if self:willDieWith(self.holdQueue[1]) then
                     self.cur=nil
                     self.waiting=ENV.hang
@@ -1359,7 +1353,7 @@ function Player:hold_swap(ifpre)
 
             self.spinLast=false
 
-            local hb=self:_get_new_block(C)
+            local hb=self:_getBlock(C.id,C.name,C.color)
             self.cur,self.nextQueue[hid]=self.nextQueue[hid],hb
             self.cur.bagLine=nil
 
@@ -1368,7 +1362,7 @@ function Player:hold_swap(ifpre)
             self.spinLast=false
 
             if C then
-                local hb=self:_get_new_block(C)
+                local hb=self:_getBlock(C.id,C.name,C.color)
                 ins(self.holdQueue,self.nextQueue[hid])
                 self.nextQueue[hid]=hb
                 if self:willDieWith(self.holdQueue[1]) then
@@ -1411,7 +1405,7 @@ function Player:hold(ifpre,force)
     end
 end
 
-function Player:getBlock(id,name,color,bagLineCounter)-- Get a block object
+function Player:_getBlock(id,name,color,bagLineCounter)-- Get a block object
     local ENV=self.gameEnv
     local dir=ENV.face[id]
     return {
@@ -1425,7 +1419,7 @@ function Player:getBlock(id,name,color,bagLineCounter)-- Get a block object
     }
 end
 function Player:getNext(id,bagLineCounter)-- Push a block to nextQueue
-    ins(self.nextQueue,self:getBlock(id,nil,nil,bagLineCounter))
+    ins(self.nextQueue,self:_getBlock(id,nil,nil,bagLineCounter))
     if self.bot then
         self.bot:pushNewNext(id)
     end