From 910476da32b7cc1c5d51d223e09020b2884f50d4 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Tue, 22 May 2012 09:47:34 +0400
Subject: [PATCH] Fixed Kalastria Highborn's trigger

---
 Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java
index addea7c4cdf..c9b984718e0 100644
--- a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java
+++ b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.worldwake;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.Constants.Zone;
@@ -44,6 +43,8 @@ import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.TargetPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author maurer.it_at_gmail.com
@@ -109,8 +110,8 @@ class KalastriaHighbornTriggeredAbility extends TriggeredAbilityImpl<KalastriaHi
 			if (permanent != null &&
 				zEvent.getToZone() == Zone.GRAVEYARD &&
 				zEvent.getFromZone() == Zone.BATTLEFIELD &&
-				permanent.getControllerId().equals(this.getControllerId()) &&
-				permanent.hasSubtype("Vampire"))
+				(permanent.getControllerId().equals(this.getControllerId()) &&
+				permanent.hasSubtype("Vampire") || permanent.getId().equals(this.getSourceId())))
 			{
 				return true;
 			}