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

Merge origin/master

Browse source 
Conflicts:
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
This commit is contained in:
LevelX2 2018-01-05 23:41:30 +01:00
commit f95b0e6c0a
75 changed files with 1633 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ import mage.cards.Card;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.cards.SplitCard;
import mage.cards.SplitCardHalf;
import mage.cards.decks.Deck;
import mage.choices.ChoiceImpl;
import mage.constants.*;
@ -1341,7 +1342,11 @@ public abstract class PlayerImpl implements Player, Serializable {
}
}
}
if (zone != Zone.BATTLEFIELD && game.getContinuousEffects().asThough(object.getId(), AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, this.getId(), game)) {
UUID sourceId = object.getId();
if (object instanceof SplitCardHalf) {
sourceId = ((SplitCardHalf) object).getParentCard().getId();
}
if (zone != Zone.BATTLEFIELD && game.getContinuousEffects().asThough(sourceId, AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, playerId, game)) {
for (Ability ability : candidateAbilites) {
if (canUse || ability.getAbilityType() == AbilityType.SPECIAL_ACTION) {
ability.setControllerId(this.getId());