diff --git a/Mage.Sets/src/mage/sets/innistrad/GhostQuarter.java b/Mage.Sets/src/mage/sets/innistrad/GhostQuarter.java index c4388be4b4..6ae76cb049 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GhostQuarter.java +++ b/Mage.Sets/src/mage/sets/innistrad/GhostQuarter.java @@ -99,12 +99,12 @@ class GhostQuarterEffect extends OneShotEffect { Permanent permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); if (permanent != null) { Player player = game.getPlayer(permanent.getControllerId()); - if (player.chooseUse(Outcome.PutLandInPlay, "Do you wish to search for a basic land, put it onto the battlefied and then shuffle your library?", game)) { + if (player.chooseUse(Outcome.PutLandInPlay, "Do you wish to search for a basic land, put it onto the battlefield and then shuffle your library?", game)) { TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard()); if (player.searchLibrary(target, game)) { Card card = player.getLibrary().remove(target.getFirstTarget(), game); if (card != null) { - card.putOntoBattlefield(game, Zone.HAND, source.getId(), permanent.getControllerId()); + card.putOntoBattlefield(game, Zone.HAND, source.getId(), player.getId()); } } player.shuffleLibrary(game); diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index 2c062a7df4..0ae5a4cd7a 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -1169,7 +1169,11 @@ public abstract class GameImpl> implements Game, Serializa /*if (!lki.containsKey(objectId)) { return getCard(objectId); }*/ - return lki.get(objectId); + Card card = lki.get(objectId); + if (card != null) { + return card.copy(); + } + return null; } /**