From 7fe74f59f648a2a7e24c42842bb629324b57538b Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Thu, 9 Jan 2025 21:37:38 +0100 Subject: [PATCH] CardView: added extra check for Ward and Annihilator icons --- forge-game/src/main/java/forge/game/card/CardView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java index 2b030456f1b..9e482b5528a 100644 --- a/forge-game/src/main/java/forge/game/card/CardView.java +++ b/forge-game/src/main/java/forge/game/card/CardView.java @@ -1603,7 +1603,7 @@ void updateAbilityText(Card c, CardState state) { } void updateKeywords(Card c, CardState state) { c.updateKeywordsCache(state); - set(TrackableProperty.HasAnnihilator, c.hasKeyword(Keyword.ANNIHILATOR, state)); + set(TrackableProperty.HasAnnihilator, c.hasKeyword(Keyword.ANNIHILATOR, state) || state.getTriggers().anyMatch(t -> t.isKeyword(Keyword.ANNIHILATOR))); set(TrackableProperty.HasDeathtouch, c.hasKeyword(Keyword.DEATHTOUCH, state)); set(TrackableProperty.HasToxic, c.hasKeyword(Keyword.TOXIC, state)); set(TrackableProperty.HasDevoid, c.hasKeyword(Keyword.DEVOID, state)); @@ -1617,7 +1617,7 @@ void updateKeywords(Card c, CardState state) { set(TrackableProperty.HasFear, c.hasKeyword(Keyword.FEAR, state)); set(TrackableProperty.HasHexproof, c.hasKeyword(Keyword.HEXPROOF, state)); set(TrackableProperty.HasHorsemanship, c.hasKeyword(Keyword.HORSEMANSHIP, state)); - set(TrackableProperty.HasWard, c.hasKeyword(Keyword.WARD, state)); + set(TrackableProperty.HasWard, c.hasKeyword(Keyword.WARD, state) || state.getTriggers().anyMatch(t -> t.isKeyword(Keyword.WARD))); set(TrackableProperty.HasWither, c.hasKeyword(Keyword.WITHER, state)); set(TrackableProperty.HasIndestructible, c.hasKeyword(Keyword.INDESTRUCTIBLE, state)); set(TrackableProperty.HasIntimidate, c.hasKeyword(Keyword.INTIMIDATE, state));