From d484991818d153e8a332993394a76d7e04fc0f84 Mon Sep 17 00:00:00 2001
From: ciaccona007 <sgmbogus@gmail.com>
Date: Sat, 29 Jul 2017 19:07:25 -0400
Subject: [PATCH] Fix problem in Permanent.destroy()

---
 Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java  | 3 ++-
 .../test/cards/single/KalitasBloodchiefOfGhetTest.java   | 1 +
 .../src/main/java/mage/game/permanent/PermanentImpl.java | 9 +++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java
index 353bc8682e6..6398d8d338a 100644
--- a/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java
+++ b/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java
@@ -27,7 +27,6 @@
  */
 package mage.cards.k;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -46,6 +45,8 @@ import mage.game.permanent.Permanent;
 import mage.game.permanent.token.KalitasVampireToken;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author LevelX2
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/KalitasBloodchiefOfGhetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/KalitasBloodchiefOfGhetTest.java
index ce58ce1b55d..359d4ee1803 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/KalitasBloodchiefOfGhetTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/KalitasBloodchiefOfGhetTest.java
@@ -20,6 +20,7 @@ public class KalitasBloodchiefOfGhetTest extends CardTestPlayerBase {
         execute();
 
         assertPermanentCount(playerA, 5);
+        assertPermanentCount(playerA, "Vampire", 0);
         assertPermanentCount(playerB, 0);
     }
 }
diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
index 7152b7c68dc..2cd47edadc5 100644
--- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
+++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
@@ -27,7 +27,6 @@
  */
 package mage.game.permanent;
 
-import java.util.*;
 import mage.MageObject;
 import mage.MageObjectReference;
 import mage.ObjectColor;
@@ -56,6 +55,8 @@ import mage.players.Player;
 import mage.util.GameLog;
 import mage.util.ThreadLocalStringBuilder;
 
+import java.util.*;
+
 /**
  * @author BetaSteward_at_googlemail.com
  */
@@ -953,8 +954,8 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
         }
 
         if (!game.replaceEvent(GameEvent.getEvent(EventType.DESTROY_PERMANENT, objectId, sourceId, controllerId, noRegen ? 1 : 0))) {
-            // this means destroy was successfull, if object movement to graveyard will be replaced (e.g. commander to command zone) does not count for
-            // successfull destroying.
+            // this means destroy was successful, if object movement to graveyard will be replaced (e.g. commander to command zone) does not count for
+            // successful destroying.
             if (moveToZone(Zone.GRAVEYARD, sourceId, game, false)) {
                 if (!game.isSimulation()) {
                     String logName;
@@ -971,8 +972,8 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
                     }
                 }
                 game.fireEvent(GameEvent.getEvent(EventType.DESTROYED_PERMANENT, objectId, sourceId, controllerId));
+                return true;
             }
-            return true; //
         }
         return false;
     }