From 153a5df2a54cfe7eb1c9c424ed9196354e44be30 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Sun, 3 Jun 2012 19:50:17 +0400
Subject: [PATCH] Fixed Champion of Lambholt - gave ability only to itself. +1
 test passed.

---
 .../src/mage/sets/avacynrestored/ChampionOfLambholt.java  | 8 ++++++--
 .../org/mage/test/combat/AttackBlockRestrictionsTest.java | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ChampionOfLambholt.java b/Mage.Sets/src/mage/sets/avacynrestored/ChampionOfLambholt.java
index 6ec07e9e712..4110a38059f 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/ChampionOfLambholt.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/ChampionOfLambholt.java
@@ -89,7 +89,7 @@ class ChampionOfLambholtEffect extends RestrictionEffect<ChampionOfLambholtEffec
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
         Permanent sourcePermanent = game.getPermanent(source.getSourceId());
-        if (sourcePermanent != null && permanent.equals(sourcePermanent)) {
+        if (sourcePermanent != null) {
             return true;
         }
         return false;
@@ -98,7 +98,11 @@ class ChampionOfLambholtEffect extends RestrictionEffect<ChampionOfLambholtEffec
     @Override
     public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
         if (attacker != null && blocker != null) {
-            return blocker.getPower().getValue() > attacker.getPower().getValue();
+            Permanent sourcePermanent = game.getPermanent(source.getSourceId());
+            if (sourcePermanent != null) {
+                return attacker.getControllerId().equals(sourcePermanent.getControllerId())
+                    && blocker.getPower().getValue() > attacker.getPower().getValue();
+            }
         }
         return true;
     }
diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java
index ef9091d39b4..607fac9fe61 100644
--- a/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java
@@ -187,13 +187,13 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase {
 
         // non flying vs. flying
         attack(2, playerB, "Elite Vanguard");
-        block(2, playerA, "Angelic Wall", "Elite Vanguard");
+        block(2, playerA, "Angelic Wall", "Elite Vanguard"); // can't block
         // non flying vs. non flying
         attack(2, playerB, "Arbor Elf");
-        block(2, playerA, "Llanowar Elves", "Arbor Elf");
+        block(2, playerA, "Llanowar Elves", "Arbor Elf"); // can block
         // flying vs. flying
         attack(2, playerB, "Assault Griffin");
-        block(2, playerA, "Air Elemental", "Assault Griffin");
+        block(2, playerA, "Air Elemental", "Assault Griffin"); // can block
 
         setStopAt(2, Constants.PhaseStep.END_TURN);
         execute();