diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
index 3eb099aa..4c5feada 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
@@ -24,7 +24,6 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.libs.StorageLib;
-import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
@@ -32,7 +31,6 @@ import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -72,9 +70,10 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerQuit(PlayerQuitEvent event) {
+        if(Permission.BUILD.hasPermission(event.getPlayer())) {
+            ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfLeave, LuaValue.NIL, event);
+        }
         StorageLib.removePlayer(event.getPlayer());
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfLeave, LuaValue.NIL, event);
     }
 
     @EventHandler(priority = EventPriority.HIGH)