From d224e148a444c5d238fa681b4434f37df911bbfd Mon Sep 17 00:00:00 2001
From: RalphR <1715333874@qq.com>
Date: Wed, 18 Sep 2024 13:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0EventPhaseSkipped=E6=97=B6?=
 =?UTF-8?q?=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/server/event.lua        | 3 ++-
 lua/server/serverplayer.lua | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lua/server/event.lua b/lua/server/event.lua
index 2abb7bb..78fe463 100644
--- a/lua/server/event.lua
+++ b/lua/server/event.lua
@@ -19,6 +19,7 @@ fk.EventPhaseEnd = 6
 fk.AfterPhaseEnd = 86
 fk.EventPhaseChanging = 7
 fk.EventPhaseSkipping = 8
+fk.EventPhaseSkipped = 101
 
 fk.BeforeCardsMove = 9
 fk.AfterCardsMove = 10
@@ -149,4 +150,4 @@ fk.AfterPlayerRevived = 95
 -- 99 = AfterAskForCardResponse
 -- 100 = AfterAskForNullification
 
-fk.NumOfEvents = 101
+fk.NumOfEvents = 102
diff --git a/lua/server/serverplayer.lua b/lua/server/serverplayer.lua
index f3548bf..7d70c44 100644
--- a/lua/server/serverplayer.lua
+++ b/lua/server/serverplayer.lua
@@ -417,7 +417,7 @@ function ServerPlayer:gainAnExtraPhase(phase, delay)
 
   local cancel_skip = true
   if phase ~= Player.NotActive and (skip) then
-    cancel_skip = logic:trigger(fk.EventPhaseSkipping, self)
+    cancel_skip = logic:trigger(fk.EventPhaseSkipping, self, phase)
   end
   if (not skip) or (cancel_skip) then
     room:sendLog{
@@ -439,6 +439,7 @@ function ServerPlayer:gainAnExtraPhase(phase, delay)
       from = self.id,
       arg = Util.PhaseStrMapper(phase),
     }
+    logic:trigger(fk.EventPhaseSkipped, self, phase)
   end
 
   self.phase = current
@@ -501,7 +502,7 @@ function ServerPlayer:play(phase_table)
 
     local cancel_skip = true
     if phases[i] ~= Player.NotActive and (skip) then
-      cancel_skip = logic:trigger(fk.EventPhaseSkipping, self)
+      cancel_skip = logic:trigger(fk.EventPhaseSkipping, self, self.phase)
     end
 
     if (not skip) or (cancel_skip) then
@@ -512,6 +513,7 @@ function ServerPlayer:play(phase_table)
         from = self.id,
         arg = Util.PhaseStrMapper(self.phase),
       }
+      logic:trigger(fk.EventPhaseSkipped, self, self.phase)
     end
   end
 end
-- 
Gitee