From 2bf987fe9a443c998490ae50f74cd9aee70a0ac5 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 19 Jun 2014 00:32:30 +0200
Subject: [PATCH] * Kodama's Reach, Cultivate - Fixed possible NPE (null
 pointer exception) error.

---
 .../src/mage/sets/commander/KodamasReach.java | 19 ++++++-------
 .../src/mage/sets/magic2011/Cultivate.java    | 28 +++++++++----------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/commander/KodamasReach.java b/Mage.Sets/src/mage/sets/commander/KodamasReach.java
index bd5f72634fb..85f3e8ed814 100644
--- a/Mage.Sets/src/mage/sets/commander/KodamasReach.java
+++ b/Mage.Sets/src/mage/sets/commander/KodamasReach.java
@@ -42,7 +42,6 @@ import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterBasicLandCard;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.TargetCard;
 import mage.target.common.TargetCardInLibrary;
@@ -108,21 +107,19 @@ class KodamasReachEffect extends OneShotEffect {
                     TargetCard target2 = new TargetCard(Zone.PICK, filter);
                     player.choose(Outcome.Benefit, revealed, target2, game);
                     Card card = revealed.get(target2.getFirstTarget(), game);
-                    card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId());
-                    revealed.remove(card);
-                    Permanent permanent = game.getPermanent(card.getId());
-                    if (permanent != null) {
-                        permanent.setTapped(true);
+                    if (card != null) {
+                        player.putOntoBattlefieldWithInfo(card, game, Zone.LIBRARY, source.getSourceId(), true);
+                        revealed.remove(card);
                     }
                     card = revealed.getCards(game).iterator().next();
-                    card.moveToZone(Zone.HAND, source.getId(), game, false);
+                    if (card != null) {
+                        player.moveCardToHandWithInfo(card, source.getSourceId(), game, Zone.LIBRARY);
+                    }
                 }
                 else if (target.getTargets().size() == 1) {
                     Card card = revealed.getCards(game).iterator().next();
-                    card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId());
-                    Permanent permanent = game.getPermanent(card.getId());
-                    if (permanent != null) {
-                        permanent.setTapped(true);
+                    if (card != null) {
+                        player.putOntoBattlefieldWithInfo(card, game, Zone.LIBRARY, source.getSourceId(), true);
                     }
                 }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/Cultivate.java b/Mage.Sets/src/mage/sets/magic2011/Cultivate.java
index 702f3d78909..76610330671 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Cultivate.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Cultivate.java
@@ -30,20 +30,19 @@ package mage.sets.magic2011;
 
 import java.util.List;
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.Cards;
 import mage.cards.CardsImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterBasicLandCard;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.TargetCard;
 import mage.target.common.TargetCardInLibrary;
@@ -107,21 +106,20 @@ class CultivateEffect extends OneShotEffect {
                     TargetCard target2 = new TargetCard(Zone.PICK, filter);
                     player.choose(Outcome.Benefit, revealed, target2, game);
                     Card card = revealed.get(target2.getFirstTarget(), game);
-                    card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId());
-                    revealed.remove(card);
-                    Permanent permanent = game.getPermanent(card.getId());
-                    if (permanent != null) {
-                        permanent.setTapped(true);
+                    if (card != null) {
+                        player.putOntoBattlefieldWithInfo(card, game, Zone.LIBRARY, source.getSourceId(), true);
+                        revealed.remove(card);
                     }
                     card = revealed.getCards(game).iterator().next();
-                    card.moveToZone(Zone.HAND, source.getId(), game, false);
+                    if (card != null) {
+                        player.moveCardToHandWithInfo(card, source.getSourceId(), game, Zone.LIBRARY);
+                    }
                 }
                 else if (target.getTargets().size() == 1) {
                     Card card = revealed.getCards(game).iterator().next();
-                    card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId());
-                    Permanent permanent = game.getPermanent(card.getId());
-                    if (permanent != null)
-                        permanent.setTapped(true);
+                    if (card != null) {
+                        player.putOntoBattlefieldWithInfo(card, game, Zone.LIBRARY, source.getSourceId(), true);
+                    }
                 }
 
             }