From 0afca982b2d5a0190d792c961b721b9bb6720b6e Mon Sep 17 00:00:00 2001
From: Daniel Saukel <sa.da@unitybox.de>
Date: Mon, 28 Mar 2016 21:11:01 +0200
Subject: [PATCH] Fixed leave teleportation bug

---
 pom.xml                                                      | 2 +-
 src/main/java/io/github/dre2n/dungeonsxl/game/GameWorld.java | 1 +
 src/main/java/io/github/dre2n/dungeonsxl/player/DPlayer.java | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec760898..b3e4a0ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.dre2n</groupId>
     <artifactId>dungeonsxl</artifactId>
-    <version>0.11-SNAPSHOT-29</version>
+    <version>0.11-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>DungeonsXL</name>
     <url>https://dre2n.github.io</url>
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameWorld.java b/src/main/java/io/github/dre2n/dungeonsxl/game/GameWorld.java
index c0d52da5..a548fd5f 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/game/GameWorld.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/game/GameWorld.java
@@ -648,6 +648,7 @@ public class GameWorld {
 
                 if (bestTime == 0) {
                     return false;
+
                 } else if (worldConfig.getTimeLastPlayed() != 0) {
                     if (System.currentTimeMillis() - bestTime > worldConfig.getTimeLastPlayed() * (long) 3600000) {
                         return false;
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayer.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayer.java
index 07e79ce0..18d4f32e 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayer.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayer.java
@@ -499,6 +499,8 @@ public class DPlayer extends DGlobalPlayer {
     }
 
     public void leave() {
+        delete();
+        
         if (!editing) {
             WorldConfig dConfig = GameWorld.getByWorld(world).getConfig();
             if (finished) {
@@ -603,8 +605,6 @@ public class DPlayer extends DGlobalPlayer {
                 }
             }
         }
-
-        delete();
     }
 
     public void ready() {