From ddeb0de911969114f51bd0f2d55d0cbdad36aab2 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Thu, 5 May 2011 12:53:22 +0400
Subject: [PATCH] Fix for Issue 41.

---
 .../src/mage/sets/worldwake/KalastriaHighborn.java   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java
index 444d6cebc6d..637736d61c8 100644
--- a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java
+++ b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java
@@ -75,7 +75,7 @@ public class KalastriaHighborn extends CardImpl<KalastriaHighborn> {
 
 class KalastriaHighbornTriggeredAbility extends TriggeredAbilityImpl<KalastriaHighbornTriggeredAbility> {
 	KalastriaHighbornTriggeredAbility ( ) {
-		super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), false);
+		super(Zone.ALL, new LoseLifeTargetEffect(2), false);
 		this.addCost(new ManaCostsImpl("{B}"));
 		this.addTarget(new TargetPlayer());
 		this.getEffects().add(new GainLifeEffect(2));
@@ -93,6 +93,16 @@ class KalastriaHighbornTriggeredAbility extends TriggeredAbilityImpl<KalastriaHi
 	@Override
 	public boolean checkTrigger(GameEvent event, Game game) {
 		if ( event.getType() == EventType.ZONE_CHANGE ) {
+
+			// ayrat: make sure Kalastria Highborn is on battlefield
+			UUID sourceId = getSourceId();
+			if (game.getPermanent(sourceId) == null) {
+				// or it is being removed
+				if (game.getLastKnownInformation(sourceId, Zone.BATTLEFIELD) == null) {
+					return false;
+				}
+			}
+
 			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
 			Permanent permanent = zEvent.getTarget();