diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java index b8afd4a4b16..bd0c2704273 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java @@ -2879,7 +2879,7 @@ public class ComputerUtil { // no life gain is not negative return false; } else if (Iterables.any(list, CardTraitPredicates.hasParam("AiLogic", "LoseLife"))) { - // lose life is only negagive is the player can lose life + // lose life is only negative is the player can lose life return player.canLoseLife(); } else if (Iterables.any(list, CardTraitPredicates.hasParam("AiLogic", "LichDraw"))) { // if it would draw more cards than player has, then its negative diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java index c97cde6b481..f104541572e 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java @@ -2375,7 +2375,6 @@ public class ComputerUtilCombat { repParams.put(AbilityKey.DamageSource, attacker); repParams.put(AbilityKey.DamageAmount, damage); repParams.put(AbilityKey.IsCombat, true); - repParams.put(AbilityKey.Prevention, true); List list = game.getReplacementHandler().getReplacementList( ReplacementType.DamageDone, repParams, ReplacementLayer.Other); diff --git a/forge-game/src/main/java/forge/game/ability/AbilityKey.java b/forge-game/src/main/java/forge/game/ability/AbilityKey.java index e3e5dd7db83..1a36cbe44b6 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityKey.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityKey.java @@ -41,7 +41,6 @@ public enum AbilityKey { CounteredSA("CounteredSA"), CounterNum("CounterNum"), CounterMap("CounterMap"), - CounterTable("CounterTable"), CounterType("CounterType"), Crew("Crew"), CumulativeUpkeepPaid("CumulativeUpkeepPaid"), @@ -103,8 +102,6 @@ public enum AbilityKey { Phase("Phase"), Player("Player"), PreventedAmount("PreventedAmount"), - PreventMap("PreventMap"), - Prevention("Prevention"), Produced("Produced"), Regeneration("Regeneration"), ReplacementEffect("ReplacementEffect"), diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java index dd52d246a09..10187567ef5 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java @@ -175,7 +175,6 @@ public class ReplacementHandler { final Card c = preList.get(crd); for (final ReplacementEffect replacementEffect : c.getReplacementEffects()) { - // Use "CheckLKIZone" parameter to test for effects that care abut where the card was last (e.g. Kalitas, Traitor of Ghet // getting hit by mass removal should still produce tokens). Zone cardZone = "True".equals(replacementEffect.getParam("CheckSelfLKIZone")) ? game.getChangeZoneLKIInfo(c).getLastKnownZone() : game.getZoneOf(c);