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

Fixed ShuffleIntoLibrarySourceEffect not working for permanent objects.

Browse source
This commit is contained in:
LevelX2 2015-06-23 11:27:30 +02:00
parent 6b2bfc5e19
commit a9ba34395f
1 changed files with 22 additions and 8 deletions

30
Mage/src/mage/abilities/effects/common/ShuffleIntoLibrarySourceEffect.java
View file

@ -28,12 +28,14 @@
package mage.abilities.effects.common; package mage.abilities.effects.common;
import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.cards.Card; import mage.cards.Card;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
/** /**
@ -54,15 +56,27 @@ public class ShuffleIntoLibrarySourceEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Card card = game.getCard(source.getSourceId()); MageObject mageObject = source.getSourceObjectIfItStillExists(game);
if (card != null) { if (mageObject != null) {
Player player = game.getPlayer(card.getOwnerId()); Zone fromZone = game.getState().getZone(mageObject.getId());
if (player != null) { Player owner;
Zone fromZone = game.getState().getZone(card.getId()); if (mageObject instanceof Permanent) {
player.moveCardToLibraryWithInfo(card, source.getSourceId(), game, fromZone, true, true); owner = game.getPlayer(((Permanent) mageObject).getOwnerId());
player.shuffleLibrary(game); if (owner != null) {
return true; owner.moveCardToLibraryWithInfo((Permanent)mageObject, source.getSourceId(), game, fromZone, true, true);
owner.shuffleLibrary(game);
return true;
}
} else if (mageObject instanceof Card) {
owner = game.getPlayer(((Card) mageObject).getOwnerId());
if (owner != null) {
owner.moveCardToLibraryWithInfo((Card)mageObject, source.getSourceId(), game, fromZone, true, true);
owner.shuffleLibrary(game);
return true;
}
} }
} }
return false; return false;
} }