From d0e0f60ae73f84df782bf7266525242e1049d974 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 15 Dec 2013 14:20:46 +0100
Subject: [PATCH] * Norn's Annex - Added missing planeswalker handling.

---
 .../src/mage/sets/newphyrexia/NornsAnnex.java | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java b/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java
index f215cf8980..a2b9bd6986 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/NornsAnnex.java
@@ -29,15 +29,19 @@
 package mage.sets.newphyrexia;
 
 import java.util.UUID;
-
-import mage.constants.*;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
 import mage.players.Player;
 
 /**
@@ -65,7 +69,7 @@ public class NornsAnnex extends CardImpl<NornsAnnex> {
 
 class NornsAnnexReplacementEffect extends ReplacementEffectImpl<NornsAnnexReplacementEffect> {
 
-    private static final String effectText = "Creatures can't attack you unless their controller pays {WP} for each creature he or she controls that's attacking you";
+    private static final String effectText = "Creatures can't attack you or a planeswalker you control unless their controller pays {WP} for each creature he or she controls that's attacking you";
 
     NornsAnnexReplacementEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit);
@@ -101,8 +105,16 @@ class NornsAnnexReplacementEffect extends ReplacementEffectImpl<NornsAnnexReplac
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.DECLARE_ATTACKER && event.getTargetId().equals(source.getControllerId())) {
-            return true;
+        if (event.getType() == GameEvent.EventType.DECLARE_ATTACKER) {
+            if (event.getTargetId().equals(source.getControllerId()) ) {
+                return true;
+            }
+            // planeswalker
+            Permanent permanent = game.getPermanent(event.getTargetId());
+            if (permanent != null && permanent.getControllerId().equals(source.getControllerId())
+                                  && permanent.getCardType().contains(CardType.PLANESWALKER)) {
+                return true;
+            }
         }
         return false;
     }