From bf16a4056476aa73b9e380dfb1adc3ed8aa4e77e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 8 Jul 2015 16:26:11 +0200 Subject: [PATCH] * Oona's Blackguard - Fixed subtype change not takinng changeling or is all creature types into account. --- .../src/mage/sets/morningtide/OonasBlackguard.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/morningtide/OonasBlackguard.java b/Mage.Sets/src/mage/sets/morningtide/OonasBlackguard.java index 377e70bf95d..624ac5cf2dc 100644 --- a/Mage.Sets/src/mage/sets/morningtide/OonasBlackguard.java +++ b/Mage.Sets/src/mage/sets/morningtide/OonasBlackguard.java @@ -103,9 +103,9 @@ class OonasBlackguardReplacementEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { Permanent creature = game.getPermanent(event.getTargetId()); - if (creature != null && creature.getControllerId().equals(source.getControllerId()) + if (creature != null && creature.getControllerId().equals(source.getControllerId()) && creature.getCardType().contains(CardType.CREATURE) - && creature.getSubtype().contains("Rogue") + && creature.hasSubtype("Rogue") && !event.getTargetId().equals(source.getSourceId())) { return true; } @@ -126,7 +126,6 @@ class OonasBlackguardReplacementEffect extends ReplacementEffectImpl { return false; } - @Override public OonasBlackguardReplacementEffect copy() { return new OonasBlackguardReplacementEffect(this); @@ -158,10 +157,9 @@ class OonasBlackguardTriggeredAbility extends TriggeredAbilityImpl { if (((DamagedPlayerEvent) event).isCombatDamage()) { Permanent creature = game.getPermanent(event.getSourceId()); if (creature != null && creature.getControllerId().equals(getControllerId()) && creature.getCounters().getCount(CounterType.P1P1) > 0) { - for(Effect effect : this.getEffects()) - { - effect.setTargetPointer(new FixedTarget(event.getPlayerId())); - } + for (Effect effect : this.getEffects()) { + effect.setTargetPointer(new FixedTarget(event.getPlayerId())); + } return true; } }