From 15602cdfb3b4e07eb78f241ec9e0fa0b425d74c2 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 8 Mar 2018 23:27:19 +0100
Subject: [PATCH] Small change to Uphill Battle.
---
Mage.Sets/src/mage/cards/u/UphillBattle.java | 11 ++++++-----
Mage/src/main/java/mage/game/permanent/Permanent.java | 1 -
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Mage.Sets/src/mage/cards/u/UphillBattle.java b/Mage.Sets/src/mage/cards/u/UphillBattle.java
index 35064c1075..86ed97b472 100644
--- a/Mage.Sets/src/mage/cards/u/UphillBattle.java
+++ b/Mage.Sets/src/mage/cards/u/UphillBattle.java
@@ -49,9 +49,11 @@ import mage.watchers.common.CreatureWasCastWatcher;
* @author chrvanorle
*/
public class UphillBattle extends CardImpl {
-
+
public UphillBattle(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}");
+ super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}");
+
+ // Creatures played by your opponents enter the battlefield tapped.
Ability tapAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new UphillBattleTapEffect());
tapAbility.addWatcher(new CreatureWasCastWatcher());
tapAbility.addWatcher(new PlayCreatureLandWatcher());
@@ -118,7 +120,6 @@ class PlayCreatureLandWatcher extends Watcher {
}
}
-
class UphillBattleTapEffect extends ReplacementEffectImpl {
UphillBattleTapEffect() {
@@ -129,13 +130,13 @@ class UphillBattleTapEffect extends ReplacementEffectImpl {
UphillBattleTapEffect(final UphillBattleTapEffect effect) {
super(effect);
}
-
+
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Permanent target = ((EntersTheBattlefieldEvent) event).getTarget();
CreatureWasCastWatcher creatureSpellWatcher = (CreatureWasCastWatcher) game.getState().getWatchers().get(CreatureWasCastWatcher.class.getSimpleName());
PlayCreatureLandWatcher landWatcher = (PlayCreatureLandWatcher) game.getState().getWatchers().get(PlayCreatureLandWatcher.class.getSimpleName());
-
+
if (target != null
&& ((creatureSpellWatcher != null && creatureSpellWatcher.wasCreatureCastThisTurn(target.getId()))
|| (landWatcher != null && landWatcher.wasLandPlayed(target.getId())))) {
diff --git a/Mage/src/main/java/mage/game/permanent/Permanent.java b/Mage/src/main/java/mage/game/permanent/Permanent.java
index 8700e560df..8b9273e824 100644
--- a/Mage/src/main/java/mage/game/permanent/Permanent.java
+++ b/Mage/src/main/java/mage/game/permanent/Permanent.java
@@ -59,7 +59,6 @@ public interface Permanent extends Card, Controllable {
* @param tapped
* @deprecated
*/
- @Deprecated
void setTapped(boolean tapped);
boolean canTap();