github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 03:00:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KHM] Tyvar Kell - Added check for zone change counters in emblem effect

Browse source
This commit is contained in:
Daniel Bomar 2021-01-10 15:30:18 -06:00
parent 6d3e29078c
commit f131fd0d12
No known key found for this signature in database
GPG key ID: C86C8658F4023918
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage/src/main/java/mage/game/command/emblems/TyvarKellEmblem.java
View file

@ -15,7 +15,6 @@ import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import java.util.Iterator;
import java.util.UUID;
/**
*
@ -36,7 +35,7 @@ public final class TyvarKellEmblem extends Emblem {
Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND, new TyvarKellEmblemEffect(
HasteAbility.getInstance(), Duration.EndOfTurn), filter, false, true
);
ability.addEffect(new DrawCardSourceControllerEffect(2).setText("and you draw two cards"));
ability.addEffect(new DrawCardSourceControllerEffect(2, "you").concatBy("and"));
this.getAbilities().add(ability);
}
}
@ -80,16 +79,19 @@ class TyvarKellEmblemEffect extends ContinuousEffectImpl {
public boolean apply(Game game, Ability source) {
if (this.affectedObjectsSet) {
for (Iterator<MageObjectReference> it = affectedObjectList.iterator(); it.hasNext(); ) {
UUID sourceId = it.next().getSourceId();
Card card = game.getCard(sourceId);
Permanent perm = game.getPermanent(sourceId);
MageObjectReference mor = it.next();
Card card = mor.getCard(game);
Permanent perm = game.getPermanent(mor.getSourceId());
boolean applied = false;
if (card != null && !card.hasAbility(ability, game)) {
game.getState().addOtherAbility(card, ability);
applied = true;
}
if (perm != null) {
if (perm != null && perm.getZoneChangeCounter(game) == mor.getZoneChangeCounter() + 1) {
perm.addAbility(ability, source.getSourceId(), game);
applied = true;
}
if (card == null && perm == null) {
if (!applied) {
it.remove();
if (affectedObjectList.isEmpty()) {
discard();