From 489a727f5c924f0af91ac68f9cdd62975a2b3d48 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Tue, 16 Jul 2013 08:27:48 +0200
Subject: [PATCH] * Master of Diversion - Fixed NPE because of using wrong id
 (Fixes #284).

---
 Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java b/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java
index 1f657e3b24..45b4482743 100644
--- a/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java
+++ b/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java
@@ -73,7 +73,7 @@ public class MasterOfDiversion extends CardImpl<MasterOfDiversion> {
         if (ability.getAbilityType().equals(AbilityType.TRIGGERED)) {
             ability.getTargets().clear();
             FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls");
-            UUID defenderId = game.getCombat().getDefendingPlayer(ability.getControllerId());
+            UUID defenderId = game.getCombat().getDefendingPlayer(ability.getSourceId());
             filter.add(new ControllerIdPredicate(defenderId));
             TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
             target.setRequired(true);