From defc9f41f4fcea5d131494232b84038d22d88c55 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sat, 28 May 2022 22:45:09 -0400 Subject: [PATCH] Card.java toughnessAssignsDamage() boolean refactor --- forge-game/src/main/java/forge/game/card/Card.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index a12898059d0..deca69d47f7 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -54,13 +54,7 @@ import forge.game.replacement.ReplacementHandler; import forge.game.replacement.ReplacementResult; import forge.game.replacement.ReplacementType; import forge.game.spellability.*; -import forge.game.staticability.StaticAbility; -import forge.game.staticability.StaticAbilityCantAttackBlock; -import forge.game.staticability.StaticAbilityCantPutCounter; -import forge.game.staticability.StaticAbilityCantSacrifice; -import forge.game.staticability.StaticAbilityCantTarget; -import forge.game.staticability.StaticAbilityCantTransform; -import forge.game.staticability.StaticAbilityIgnoreLegendRule; +import forge.game.staticability.*; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.game.trigger.TriggerType; @@ -4130,8 +4124,7 @@ public class Card extends GameEntity implements Comparable, IHasSVars { } public final boolean toughnessAssignsDamage() { - return getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.toughnessAssignsDamage) - || hasKeyword("CARDNAME assigns combat damage equal to its toughness rather than its power"); + return StaticAbilityCombatDamageToughness.combatDamageToughness(this); } // How much combat damage does the card deal