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

Fix issue with casting opponents' cards.

Browse source
This commit is contained in:
Patrick Hulin 2019-12-10 13:33:27 -05:00
parent cd890d329a
commit 2f138a04ae
5 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -3218,10 +3218,14 @@ public abstract class PlayerImpl implements Player, Serializable {
}
}
private List<Ability> cardPlayableAbilities(Game game, Card card) {
private List<Ability> cardPlayableAbilities(Game game, Card card, boolean setControllerId) {
List<Ability> playable = new ArrayList();
if (card != null) {
for (ActivatedAbility ability : card.getAbilities().getActivatedAbilities(Zone.HAND)) {
if (setControllerId) {
// For when owner != caster, e.g. with Psychic Intrusion and similar effects.
ability.setControllerId(getId());
}
if (ability instanceof SpellAbility
&& null != game.getContinuousEffects().asThough(card.getId(),
AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, ability, getId(), game)) {
@ -3231,6 +3235,9 @@ public abstract class PlayerImpl implements Player, Serializable {
AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, card.getSpellAbility(), getId(), game)) {
playable.add(ability);
}
if (setControllerId) {
ability.setControllerId(card.getOwnerId());
}
}
}
return playable;
@ -3312,7 +3319,7 @@ public abstract class PlayerImpl implements Player, Serializable {
if (fromAll || fromZone == Zone.EXILED) {
for (ExileZone exile : game.getExile().getExileZones()) {
for (Card card : exile.getCards(game)) {
playable.addAll(cardPlayableAbilities(game, card));
playable.addAll(cardPlayableAbilities(game, card, true));
}
}
}
@ -3321,7 +3328,7 @@ public abstract class PlayerImpl implements Player, Serializable {
if (fromAll) {
for (Cards revealedCards : game.getState().getRevealed().values()) {
for (Card card : revealedCards.getCards(game)) {
playable.addAll(cardPlayableAbilities(game, card));
playable.addAll(cardPlayableAbilities(game, card, false));
}
}
}
@ -3333,7 +3340,7 @@ public abstract class PlayerImpl implements Player, Serializable {
if (player != null) {
if (/*player.isTopCardRevealed() &&*/player.getLibrary().hasCards()) {
Card card = player.getLibrary().getFromTop(game);
playable.addAll(cardPlayableAbilities(game, card));
playable.addAll(cardPlayableAbilities(game, card, false));
}
}
}