From eec3c44f1e13021338c584974bd2367f3e839473 Mon Sep 17 00:00:00 2001 From: Daniel Bomar Date: Mon, 27 Sep 2021 16:01:28 -0500 Subject: [PATCH] Removed game.preventDamage method (fixes #8280) --- Mage/src/main/java/mage/game/Game.java | 18 ++---------------- Mage/src/main/java/mage/game/GameImpl.java | 5 ----- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/Mage/src/main/java/mage/game/Game.java b/Mage/src/main/java/mage/game/Game.java index e6e9ea934b1..9cbdbf01d50 100644 --- a/Mage/src/main/java/mage/game/Game.java +++ b/Mage/src/main/java/mage/game/Game.java @@ -316,31 +316,17 @@ public interface Game extends MageItem, Serializable, Copyable { boolean replaceEvent(GameEvent event, Ability targetAbility); /** - * Creates and fires an damage prevention event + * Creates and fires a damage prevention event * * @param damageEvent damage event that will be replaced (instanceof * check will be done) * @param source ability that's the source of the prevention effect * @param game * @param amountToPrevent max preventable amount - * @return true prevention was successfull / false prevention was replaced + * @return true prevention was successful / false prevention was replaced */ PreventionEffectData preventDamage(GameEvent damageEvent, Ability source, Game game, int amountToPrevent); - /** - * Creates and fires an damage prevention event - * - * @param event damage event that will be replaced (instanceof - * check will be done) - * @param source ability that's the source of the prevention - * effect - * @param game - * @param preventAllDamage true if there is no limit to the damage that can - * be prevented - * @return true prevention was successfull / false prevention was replaced - */ - PreventionEffectData preventDamage(GameEvent event, Ability source, Game game, boolean preventAllDamage); - void start(UUID choosingPlayerId); void resume(); diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index c07465a3335..71cb83352f3 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -3067,11 +3067,6 @@ public abstract class GameImpl implements Game { return state.replaceEvent(event, targetAbility, this); } - @Override - public PreventionEffectData preventDamage(GameEvent event, Ability source, Game game, boolean preventAllDamage) { - return preventDamage(event, source, game, Integer.MAX_VALUE); - } - @Override public PreventionEffectData preventDamage(GameEvent event, Ability source, Game game, int amountToPrevent) { PreventionEffectData result = new PreventionEffectData(amountToPrevent);