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

- Fixed #8231

Browse source
This commit is contained in:
jeffwadsworth 2021-09-09 08:34:45 -05:00
parent 492e27e42a
commit 81b8f48c68
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Mage.Sets/src/mage/cards/h/HedonistsTrove.java
View file

@ -73,13 +73,16 @@ class HedonistsTroveExileEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
Player targetPlayer = game.getPlayer(source.getFirstTarget());
MageObject sourceObject = source.getSourceObject(game);
UUID exileId = CardUtil.getExileZoneId(game, source);
// save the exileId associated with this specific source
game.getState().setValue(source.getSourceId().toString(), exileId);
return controller != null
&& targetPlayer != null
&& sourceObject != null
&& controller.moveCardsToExile(
targetPlayer.getGraveyard().getCards(game), source, game, true,
CardUtil.getExileZoneId(game, source), sourceObject.getIdName()
);
targetPlayer.getGraveyard().getCards(game), source, game, true,
exileId, sourceObject.getIdName()
);
}
}
@ -107,11 +110,16 @@ class HedonistsTrovePlayLandEffect extends AsThoughEffectImpl {
@Override
public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
Card cardToCheck = game.getCard(objectId);
if (cardToCheck == null || !cardToCheck.isLand(game) || !source.isControlledBy(affectedControllerId)) {
if (cardToCheck == null
|| !cardToCheck.isLand(game)
|| !source.isControlledBy(affectedControllerId)) {
return false;
}
ExileZone exileZone = game.getExile().getExileZone(CardUtil.getExileZoneId(game, source));
return exileZone != null && exileZone.contains(cardToCheck.getMainCard().getId());
// use the correct exileId
UUID exileId = (UUID) game.getState().getValue(source.getSourceId().toString());
ExileZone exileZone = game.getExile().getExileZone(exileId);
return exileZone != null
&& exileZone.contains(cardToCheck.getMainCard().getId());
}
}
@ -119,8 +127,8 @@ class HedonistsTroveCastNonlandCardsEffect extends AsThoughEffectImpl {
HedonistsTroveCastNonlandCardsEffect() {
super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "You may cast spells from among cards exiled with {this}. " +
"You can't cast more than one spell this way each turn.";
staticText = "You may cast spells from among cards exiled with {this}. "
+ "You can't cast more than one spell this way each turn.";
}
private HedonistsTroveCastNonlandCardsEffect(final HedonistsTroveCastNonlandCardsEffect effect) {
@ -140,11 +148,14 @@ class HedonistsTroveCastNonlandCardsEffect extends AsThoughEffectImpl {
@Override
public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
HedonistsTroveWatcher watcher = game.getState().getWatcher(HedonistsTroveWatcher.class);
if (watcher == null || !watcher.checkPlayer(affectedControllerId, source, game)) {
if (watcher == null
|| !watcher.checkPlayer(affectedControllerId, source, game)) {
return false;
}
Card cardToCheck = game.getCard(objectId);
ExileZone exileZone = game.getExile().getExileZone(CardUtil.getExileZoneId(game, source));
// use the correct exileId
UUID exileId = (UUID) game.getState().getValue(source.getSourceId().toString());
ExileZone exileZone = game.getExile().getExileZone(exileId);
return cardToCheck != null
&& !cardToCheck.isLand(game)
&& source.isControlledBy(affectedControllerId)
@ -164,7 +175,8 @@ class HedonistsTroveWatcher extends Watcher {
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() != GameEvent.EventType.SPELL_CAST || event.getAdditionalReference() == null) {
if (event.getType() != GameEvent.EventType.SPELL_CAST
|| event.getAdditionalReference() == null) {
return;
}
playerMap
@ -177,9 +189,9 @@ class HedonistsTroveWatcher extends Watcher {
Permanent permanent = source.getSourcePermanentOrLKI(game);
return permanent != null
&& playerMap
.getOrDefault(playerId, emptySet)
.stream()
.noneMatch(mor -> mor.refersTo(permanent, game));
.getOrDefault(playerId, emptySet)
.stream()
.noneMatch(mor -> mor.refersTo(permanent, game));
}
@Override