From 70bf68a5a4d2cc909522b4fa74c8328515911bf0 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 26 Aug 2023 00:25:01 -0400 Subject: [PATCH] simplify constructors in GainAbilityAllEffect --- .../common/continuous/GainAbilityAllEffect.java | 10 +--------- .../continuous/GainProtectionFromColorAllEffect.java | 4 +--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java index f0332ea88dc..1c8b734a083 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java @@ -29,10 +29,6 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl { protected FilterPermanent filter; protected boolean forceQuotes = false; - public GainAbilityAllEffect(Ability ability, Duration duration) { - this(ability, duration, new FilterPermanent()); - } - public GainAbilityAllEffect(Ability ability, Duration duration, FilterPermanent filter) { this(ability, duration, filter, false); } @@ -43,11 +39,7 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl { } public GainAbilityAllEffect(Ability ability, Duration duration, FilterPermanent filter, boolean excludeSource) { - this(ability, duration, filter, excludeSource, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA); - } - - public GainAbilityAllEffect(Ability ability, Duration duration, FilterPermanent filter, boolean excludeSource, Layer layer, SubLayer subLayer) { - super(duration, layer, subLayer, Outcome.AddAbility); + super(duration, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); this.ability = ability.copy(); this.ability.newId(); this.filter = filter; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorAllEffect.java index 75637e87aca..afc603bea65 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorAllEffect.java @@ -65,8 +65,6 @@ public class GainProtectionFromColorAllEffect extends GainAbilityAllEffect { return staticText; } - String text = "Choose a color. " + filter.getMessage() + " gain protection from the chosen color " + duration.toString(); - - return text; + return "Choose a color. " + filter.getMessage() + " gain protection from the chosen color " + duration.toString(); } }