* Oona's Blackguard - Fixed subtype change not takinng changeling or is all creature types into account.

This commit is contained in:
LevelX2 2015-07-08 16:26:11 +02:00
parent 8e0354d50a
commit bf16a40564

View file

@ -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;
}
}