From 1e8206baa5068661a5e7175fd3d866a12a4c533a Mon Sep 17 00:00:00 2001
From: Andrew <libraryaddict115@yahoo.co.nz>
Date: Mon, 12 Aug 2013 07:25:48 +1200
Subject: [PATCH] Let them get the event. But just don't let cancel do anything

---
 src/me/libraryaddict/disguise/DisguiseAPI.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/me/libraryaddict/disguise/DisguiseAPI.java b/src/me/libraryaddict/disguise/DisguiseAPI.java
index 065222c9..206dddb0 100644
--- a/src/me/libraryaddict/disguise/DisguiseAPI.java
+++ b/src/me/libraryaddict/disguise/DisguiseAPI.java
@@ -604,12 +604,10 @@ public class DisguiseAPI {
         Disguise disguise = getDisguise(entity);
         if (disguise == null)
             return;
-        if (((CraftEntity) entity).getHandle().valid) {
-            UndisguiseEvent event = new UndisguiseEvent(entity, disguise);
-            Bukkit.getPluginManager().callEvent(event);
-            if (event.isCancelled())
-                return;
-        }
+        UndisguiseEvent event = new UndisguiseEvent(entity, disguise);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled() && ((CraftEntity) entity).getHandle().valid)
+            return;
         disguise.getScheduler().cancel();
         disguises.remove(entity.getEntityId());
         if (((CraftEntity) entity).getHandle().valid) {