From d5d00451a84f760fa2ef15947a2efaed426ab37c Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 24 Sep 2016 01:13:13 +0200 Subject: [PATCH] Fixed a problem with static abilities for battlefield zone where the source was entering the battlefield but the ability did not work. --- .../org/mage/test/cards/abilities/keywords/UndyingTest.java | 2 +- Mage/src/main/java/mage/abilities/StaticAbility.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java index 5a2fa4d5402..e591cae4831 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java @@ -219,7 +219,7 @@ public class UndyingTest extends CardTestPlayerBase { } /** - * Tatterkite is getting counters on it, i have him in a edh deck with + * Tatterkite is getting counters on it, I have him in a edh deck with * Mikaeus, the Lunarch and when Tatterkite dies it triggers the undying and * he gets the +1/+1 counters */ diff --git a/Mage/src/main/java/mage/abilities/StaticAbility.java b/Mage/src/main/java/mage/abilities/StaticAbility.java index bbeee56b6a9..1930634dbe8 100644 --- a/Mage/src/main/java/mage/abilities/StaticAbility.java +++ b/Mage/src/main/java/mage/abilities/StaticAbility.java @@ -56,6 +56,9 @@ public abstract class StaticAbility extends AbilityImpl { if (game.getShortLivingLKI(getSourceId(), zone)) { return true; // maybe this can be a problem if effects removed the ability from the object } + if (game.getPermanentEntering(getSourceId()) != null && zone.equals(Zone.BATTLEFIELD)) { + return true; // abilities of permanents entering battlefield are countes as on battlefield + } return super.isInUseableZone(game, source, event); }