Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fix Zenos yae Galvus and Shinryu, Transcendent Rival triggers.

Browse source
This commit is contained in:
Grath 2025-06-08 11:39:19 -04:00 • committed by GitHub
commit e07a69710b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/cards/s/ShinryuTranscendentRival.java
View file

@ -120,13 +120,14 @@ class ShinryuTranscendentRivalTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.LOSES;
return event.getType() == GameEvent.EventType.LOST;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
int zcc = game.getState().getZoneChangeCounter(this.getSourceId());
return Optional
.ofNullable(this.getId() + "_" + this.getSourceObjectZoneChangeCounter() + "_opponent")
.of(this.getSourceId() + "_" + zcc + "_opponent")
.map(game.getState()::getValue)
.map(event.getPlayerId()::equals)
.orElse(false);

5
Mage.Sets/src/mage/cards/z/ZenosYaeGalvus.java
View file

@ -88,10 +88,11 @@ enum ZenosYaeGalvusPredicate implements ObjectSourcePlayerPredicate<Permanent> {
@Override
public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
int zcc = game.getState().getZoneChangeCounter(input.getSource().getSourceId());
return flag == Optional
.ofNullable(CardUtil.getObjectZoneString(
.of(CardUtil.getObjectZoneString(
"chosenCreature", input.getSource().getSourceId(), game,
input.getSource().getSourceObjectZoneChangeCounter(), false
zcc, false
))
.map(game.getState()::getValue)
.filter(MageObjectReference.class::isInstance)