diff --git a/api/src/main/java/net/jitse/npclib/listeners/PlayerListener.java b/api/src/main/java/net/jitse/npclib/listeners/PlayerListener.java
index 5f87379..d39553e 100755
--- a/api/src/main/java/net/jitse/npclib/listeners/PlayerListener.java
+++ b/api/src/main/java/net/jitse/npclib/listeners/PlayerListener.java
@@ -30,17 +30,8 @@ public class PlayerListener implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        onPlayerLeave(event.getPlayer());
-    }
-
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
-    public void onPlayerKick(PlayerKickEvent event) {
-        onPlayerLeave(event.getPlayer());
-    }
-
-    private void onPlayerLeave(Player player) {
-        for (NPCBase npc : NPCManager.getAllNPCs())
-            npc.onLogout(player);
+    	for (NPCBase npc : NPCManager.getAllNPCs())
+            npc.onLogout(event.getPlayer());
     }
 
     @EventHandler