From 6e9bd21f26c801b0ebe918d3fa936f8ca4e5e305 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Mon, 6 May 2024 19:25:35 +0800
Subject: [PATCH] bugfix

---
 character/huicui/skill.js  | 2 +-
 character/refresh/skill.js | 2 +-
 mode/guozhan.js            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/character/huicui/skill.js b/character/huicui/skill.js
index 00851c450..580008011 100644
--- a/character/huicui/skill.js
+++ b/character/huicui/skill.js
@@ -12198,7 +12198,7 @@ const skills = {
 		filter: function (event, player, name) {
 			if (player.hasSkill("zhiwei2")) return false;
 			if (!game.hasPlayer(current => current != player)) return false;
-			if (get.mode() == "guozhan") return event.name == "showCharacter" && event.toShow(name => {
+			if (get.mode() == "guozhan") return event.name == "showCharacter" && event.toShow.some(name => {
 				return get.character(name, 3).includes("zhiwei");
 			});
 			return event.name != "showCharacter" && (name != "phaseBefore" || game.phaseNumber == 0);
diff --git a/character/refresh/skill.js b/character/refresh/skill.js
index 0059bb7f3..e48412b8e 100644
--- a/character/refresh/skill.js
+++ b/character/refresh/skill.js
@@ -14207,7 +14207,7 @@ const skills = {
 				.set("ai", () => {
 					const player = get.event("player"),
 						trigger = get.event().getTrigger();
-					const cards = trigger.cards.filterInD();
+					const cards = trigger.cards ? trigger.cards.filterInD() : [];
 					if (get.event().controls.includes("拿牌")) {
 						if (
 							cards.reduce((sum, card) => {
diff --git a/mode/guozhan.js b/mode/guozhan.js
index 31eb42ca4..1e87abe19 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -2714,7 +2714,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				inherit: "zhiwei",
 				filter: function (event, player, name) {
 					if (!game.hasPlayer(current => current != player)) return false;
-					return event.name == "showCharacter" && event.toShow(name => {
+					return event.name == "showCharacter" && event.toShow.some(name => {
 						return get.character(name, 3).includes("fakezhiwei");
 					});
 				},