From d37f40a14e00c5988d5ddcd70cb2a88b81bc6f48 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 30 Jan 2015 13:28:22 +0100 Subject: [PATCH] * Fruit of the First Tree - Fixed that the life and card draw gained wronlgy the creature controller instead of Fruits controller. --- .../mage/sets/fatereforged/FruitOfTheFirstTree.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/sets/fatereforged/FruitOfTheFirstTree.java b/Mage.Sets/src/mage/sets/fatereforged/FruitOfTheFirstTree.java index b88d13a88ec..aed6ef34b0c 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/FruitOfTheFirstTree.java +++ b/Mage.Sets/src/mage/sets/fatereforged/FruitOfTheFirstTree.java @@ -28,7 +28,6 @@ package mage.sets.fatereforged; import java.util.UUID; -import static javax.xml.bind.JAXBIntrospector.getValue; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -94,14 +93,12 @@ class FruitOfTheFirstTreeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); Permanent creature = (Permanent) getValue("attachedTo"); - if (creature != null){ - Player controller = game.getPlayer(creature.getOwnerId()); - if (controller != null) { - controller.gainLife(creature.getToughness().getValue(), game); - controller.drawCards(creature.getToughness().getValue(), game); - return true; - } + if (controller != null && creature != null) { + controller.gainLife(creature.getToughness().getValue(), game); + controller.drawCards(creature.getToughness().getValue(), game); + return true; } return false; }