diff --git a/lua/core/skill.lua b/lua/core/skill.lua
index 000699d76254cb9923a046a192cbdff6be96d511..79967807d092f00430a2fa606f79c3fdff4c038b 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
diff --git a/lua/server/events/usecard.lua b/lua/server/events/usecard.lua
index 4e79b1348353891ad37d8608ddb475c0a6706272..03cea326034f3c3b60a31b9ee13b95ddddde76d7 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)