From 09b7e7baea48c01528c3ac9f04216d2b73d980cb Mon Sep 17 00:00:00 2001 From: LevelX2 <ludwig.hirth@online.de> Date: Fri, 14 Mar 2014 14:00:29 +0100 Subject: [PATCH] * Minor formatting. --- .../abilities/oneshot/sacrifice/MorticianBeetleTest.java | 8 ++++++++ Mage/src/mage/abilities/Ability.java | 1 + Mage/src/mage/abilities/AbilityImpl.java | 4 ++-- Mage/src/mage/abilities/TriggeredAbilityImpl.java | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/MorticianBeetleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/MorticianBeetleTest.java index 6ce8bb7f03..c6e1535f5d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/MorticianBeetleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/MorticianBeetleTest.java @@ -16,11 +16,19 @@ public class MorticianBeetleTest extends CardTestPlayerBase { @Test public void testSacrifice() { addCard(Zone.BATTLEFIELD, playerA, "Swamp", 4); + // Target opponent sacrifices a creature. addCard(Zone.HAND, playerA, "Cruel Edict"); + + // Target player sacrifices a creature and loses 1 life. addCard(Zone.HAND, playerA, "Geth's Verdict"); + + // Whenever a player sacrifices a creature, you may put a +1/+1 counter on Mortician Beetle. addCard(Zone.BATTLEFIELD, playerA, "Mortician Beetle"); addCard(Zone.BATTLEFIELD, playerB, "Savannah Lions"); + + // First strike + // Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.) addCard(Zone.BATTLEFIELD, playerB, "Sigiled Paladin"); diff --git a/Mage/src/mage/abilities/Ability.java b/Mage/src/mage/abilities/Ability.java index 731c8f868a..7789f04208 100644 --- a/Mage/src/mage/abilities/Ability.java +++ b/Mage/src/mage/abilities/Ability.java @@ -362,6 +362,7 @@ public interface Ability extends Controllable, Serializable { * Returns true if this abilities source is in the zone for the ability * * @param game + * @param source * @param checkLKI * @return */ diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java index a35fae1448..b4146984f3 100644 --- a/Mage/src/mage/abilities/AbilityImpl.java +++ b/Mage/src/mage/abilities/AbilityImpl.java @@ -458,7 +458,7 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability { } @Override - public Costs getCosts() { + public Costs<Cost> getCosts() { return costs; } @@ -484,7 +484,7 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability { } @Override - public Costs getOptionalCosts() { + public Costs<Cost> getOptionalCosts() { return optionalCosts; } diff --git a/Mage/src/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/mage/abilities/TriggeredAbilityImpl.java index 25dc0446e6..c9e95efef1 100644 --- a/Mage/src/mage/abilities/TriggeredAbilityImpl.java +++ b/Mage/src/mage/abilities/TriggeredAbilityImpl.java @@ -39,6 +39,7 @@ import mage.players.Player; /** * * @author BetaSteward_at_googlemail.com + * @param <T> */ public abstract class TriggeredAbilityImpl<T extends TriggeredAbilityImpl<T>> extends AbilityImpl<T> implements TriggeredAbility {