diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java index 7d2f3a1ce3a..4900ef19633 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java @@ -442,37 +442,6 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone return false; } - /** - * Apply ability. - * - * @param mode - * the mode - * @param card - * the card - * @return true, if successful - */ - public final boolean applyAbility(final String mode, final Card card) { - - // don't apply the ability if it hasn't got the right mode - if (!getParam("Mode").equals(mode)) { - return false; - } - - if (this.isSuppressed() || !this.checkConditions()) { - return false; - } - - if (mode.equals("ETBTapped")) { - return StaticAbilityETBTapped.applyETBTappedAbility(this, card); - } - - if (mode.equals("GainAbilitiesOf")) { - - } - - return false; - } - public final boolean applyAbility(final String mode, final Card card, final boolean isCombat) { // don't apply the ability if it hasn't got the right mode if (!getParam("Mode").equals(mode)) { diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java deleted file mode 100644 index 589053aee89..00000000000 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Forge: Play Magic: the Gathering. - * Copyright (C) 2011 Forge Team - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package forge.game.staticability; - -import forge.game.CardTraitBase; -import forge.game.card.Card; - - -/** - * The Class StaticAbility_CantBeCast. - */ -public class StaticAbilityETBTapped { - - /** - * TODO Write javadoc for this method. - * - * @param stAb - * a StaticAbility - * @param card - * the card - * @return true, if successful - */ - public static boolean applyETBTappedAbility(final StaticAbility stAb, final Card card) { - final Card hostCard = stAb.getHostCard(); - - if (stAb.hasParam("ValidCard")) { - if (!CardTraitBase.matchesValid(card, stAb.getParam("ValidCard").split(","), hostCard)) { - return false; - } - } - - return true; - } - -} diff --git a/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java b/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java index 09274a4454a..459dde058bb 100644 --- a/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java +++ b/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java @@ -63,19 +63,6 @@ public class PlayerZoneBattlefield extends PlayerZone { super.add(c, position, latestState); - if (trigger) { - // ETBTapped static abilities - for (final Card ca : game.getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES)) { - for (final StaticAbility stAb : ca.getStaticAbilities()) { - if (stAb.applyAbility("ETBTapped", c)) { - // it enters the battlefield this way, and should - // not fire triggers - c.setTapped(true); - } - } - } - } - if (trigger) { c.setSickness(true); // summoning sickness c.runComesIntoPlayCommands();