From f3514239a131a8a4cca741d6a0e7a9cc47b6e95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E5=A6=96=E6=A2=A6=E5=8E=A8?=
 <12796194+youmuKon-supreme@user.noreply.gitee.com>
Date: Sat, 8 Jun 2024 17:43:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CardEffect=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/server/events/usecard.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lua/server/events/usecard.lua b/lua/server/events/usecard.lua
index 4e79b13..03cea32 100644
--- a/lua/server/events/usecard.lua
+++ b/lua/server/events/usecard.lua
@@ -355,9 +355,8 @@ function CardEffect:main()
   local logic = room.logic
 
   for _, event in ipairs({ fk.PreCardEffect, fk.BeforeCardEffect, fk.CardEffecting, fk.CardEffectFinished }) do
-    local user = cardEffectEvent.from and room:getPlayerById(cardEffectEvent.from) or nil
     if cardEffectEvent.isCancellOut then
-      if logic:trigger(fk.CardEffectCancelledOut, user, cardEffectEvent) then
+      if logic:trigger(fk.CardEffectCancelledOut, room:getPlayerById(cardEffectEvent.from), cardEffectEvent) then
         cardEffectEvent.isCancellOut = false
       else
         logic:breakEvent()
@@ -379,7 +378,7 @@ function CardEffect:main()
     end
 
     if event == fk.PreCardEffect then
-      if cardEffectEvent.from and logic:trigger(event, room:getPlayerById(cardEffectEvent.from), cardEffectEvent) then
+      if logic:trigger(event, room:getPlayerById(cardEffectEvent.from), cardEffectEvent) then
         if cardEffectEvent.to then
           cardEffectEvent.nullifiedTargets = cardEffectEvent.nullifiedTargets or {}
           table.insert(cardEffectEvent.nullifiedTargets, cardEffectEvent.to)
-- 
Gitee


From 0c1c315e0576bca462f35941c4cface6530abd27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E5=A6=96=E6=A2=A6=E5=8E=A8?=
 <12796194+youmuKon-supreme@user.noreply.gitee.com>
Date: Mon, 10 Jun 2024 18:48:02 +0800
Subject: [PATCH 2/2] fix

---
 lua/core/skill.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/core/skill.lua b/lua/core/skill.lua
index 000699d..7996780 100644
--- a/lua/core/skill.lua
+++ b/lua/core/skill.lua
@@ -94,7 +94,7 @@ end
 ---@return boolean
 function Skill:isEquipmentSkill(player)
   if player then
-    local filterSkills = Fk:currentRoom().status_skills[FilterSkill]
+    local filterSkills = Fk:currentRoom().status_skills[FilterSkill] or Util.DummyTable
     for _, filter in ipairs(filterSkills) do
       local result = filter:equipSkillFilter(self, player)
       if result then
-- 
Gitee