From 2ac0ad1b5ceb3d2aa889f9eca115d8b94e669267 Mon Sep 17 00:00:00 2001
From: Daniel Saukel <sa.da@unitybox.de>
Date: Sat, 16 Jan 2016 11:29:06 +0100
Subject: [PATCH] Check if world exists before teleportation

---
 src/io/github/dre2n/dungeonsxl/player/DSavePlayer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/io/github/dre2n/dungeonsxl/player/DSavePlayer.java b/src/io/github/dre2n/dungeonsxl/player/DSavePlayer.java
index 675b98c3..f9ab6f32 100644
--- a/src/io/github/dre2n/dungeonsxl/player/DSavePlayer.java
+++ b/src/io/github/dre2n/dungeonsxl/player/DSavePlayer.java
@@ -95,7 +95,7 @@ public class DSavePlayer {
 				}
 			}
 			
-			if ( !offline) {
+			if ( !offline && oldLocation.getWorld() != null) {
 				MiscUtil.secureTeleport(player, oldLocation);
 			}