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

Fixes for Oubliette

Browse source
This commit is contained in:
Alex Vasile 2022-05-10 13:28:37 -06:00
parent 7992511cc0
commit 04a6ee57e5
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Mage.Sets/src/mage/cards/o/Oubliette.java
View file

@ -47,7 +47,7 @@ public final class Oubliette extends CardImpl {
class OubliettePhaseOutEffect extends OneShotEffect {
OubliettePhaseOutEffect() {
super(Outcome.Benefit);
super(Outcome.Detriment);
staticText = "target creature phases out until {this} leaves the battlefield. " +
"Tap that creature as it phases in this way.";
}
@ -68,11 +68,12 @@ class OubliettePhaseOutEffect extends OneShotEffect {
if (sourcePermanent == null || permanent == null) {
return false;
}
MageObjectReference mor = new MageObjectReference(permanent, game);
permanent.tap(source, game);
permanent.phaseOut(game);
game.addEffect(new OubliettePhasePreventEffect(mor), source);
game.addDelayedTriggeredAbility(new OublietteDelayedTriggeredAbility(mor), source);
return true;
}
}
@ -136,13 +137,11 @@ class OublietteDelayedTriggeredAbility extends DelayedTriggeredAbility {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getTargetId().equals(this.getSourceId())) {
ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
if (zEvent.getFromZone() == Zone.BATTLEFIELD) {
return true;
}
if (!event.getTargetId().equals(this.getSourceId())) {
return false;
}
return false;
return ((ZoneChangeEvent) event).getFromZone() == Zone.BATTLEFIELD;
}
}
@ -168,6 +167,12 @@ class OubliettePhaseInEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = mor.getPermanent(game);
return permanent != null && permanent.phaseIn(game);
if (permanent == null) {
return false;
}
permanent.setTapped(true); // Used instead of .tap so that tapped triggered abilities don't trigger
return permanent.phaseIn(game);
}
}