github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Hellkite Tyrant - Fixed that the control effect did end if Hellkite Tyrant left the battlefield (fixes #743).

Browse source
This commit is contained in:
LevelX2 2015-02-21 12:48:13 +01:00
parent f5c9a24930
commit 13300d5807
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Mage.Sets/src/mage/sets/gatecrash/HellkiteTyrant.java
View file

@ -29,13 +29,6 @@ package mage.sets.gatecrash;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbility;
@ -50,6 +43,12 @@ import mage.abilities.effects.common.WinGameSourceControllerEffect;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterArtifactPermanent;
@ -137,10 +136,10 @@ class HellkiteTyrantEffect extends OneShotEffect {
class HellkiteTyrantControlEffect extends ContinuousEffectImpl { class HellkiteTyrantControlEffect extends ContinuousEffectImpl {
private UUID controllerId; private final UUID controllerId;
public HellkiteTyrantControlEffect(UUID controllerId) { public HellkiteTyrantControlEffect(UUID controllerId) {
super(Duration.WhileOnBattlefield, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl); super(Duration.EndOfCombat, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl);
this.controllerId = controllerId; this.controllerId = controllerId;
} }
@ -160,6 +159,8 @@ class HellkiteTyrantControlEffect extends ContinuousEffectImpl {
if (permanent != null && controllerId != null) { if (permanent != null && controllerId != null) {
return permanent.changeControllerId(controllerId, game); return permanent.changeControllerId(controllerId, game);
} }
// Permanent is no longer on the battlefield, the effect can be discarded.
discard();
return false; return false;
} }
} }