From 2b2f5d4aedb6f6153cfe863d1319b1fd20d9da70 Mon Sep 17 00:00:00 2001
From: Andrew <libraryaddict115@yahoo.co.nz>
Date: Tue, 13 Aug 2013 21:57:21 +1200
Subject: [PATCH] Rename discard() to removeDisguise(). Make the disguise
 reusable

---
 src/me/libraryaddict/disguise/DisguiseAPI.java            | 4 ++--
 src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/me/libraryaddict/disguise/DisguiseAPI.java b/src/me/libraryaddict/disguise/DisguiseAPI.java
index 1cd095f9..e235379a 100644
--- a/src/me/libraryaddict/disguise/DisguiseAPI.java
+++ b/src/me/libraryaddict/disguise/DisguiseAPI.java
@@ -106,7 +106,7 @@ public class DisguiseAPI {
         setupPlayerFakeDisguise(disguise);
         // Discard the disguise
         if (oldDisguise != null)
-            oldDisguise.discard();
+            oldDisguise.removeDisguise();
     }
 
     /**
@@ -368,7 +368,7 @@ public class DisguiseAPI {
         Bukkit.getPluginManager().callEvent(event);
         if (event.isCancelled())
             return;
-        disguise.discard();
+        disguise.removeDisguise();
     }
 
     public HashMap<Integer, Disguise> getDisguises() {
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
index f1f72b95..e3872b26 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
@@ -205,18 +205,14 @@ public class Disguise {
     }
 
     /**
-     * Destroys the disguise and undisguises the entity if its using this disguise. This doesn't fire a UndisguiseEvent
+     * Removes the disguise and undisguises the entity if its using this disguise. This doesn't fire a UndisguiseEvent
      */
-    public void discard() {
-        // If the runnable is null. Just return. Its been discarded already.
-        if (runnable == null)
-            return;
+    public void removeDisguise() {
         // Why the hell can't I safely check if its running?!?!
         try {
             runnable.cancel();
         } catch (Exception ex) {
         }
-        runnable = null;
         HashMap<Integer, Disguise> disguises = disguiseAPI.getDisguises();
         // If this disguise has a entity set
         if (getEntity() != null) {