From 6522b08f7eb14fd5c4203e5c9b199061899fdd5e Mon Sep 17 00:00:00 2001
From: KrewsOrg <johnjamesharding@hotmail.co.uk>
Date: Sat, 4 May 2019 01:23:58 +0100
Subject: [PATCH] Fixed NullPointer in RoomManager.java

---
 src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
index 25adf3d5..9e43752f 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
@@ -795,11 +795,12 @@ public class RoomManager
 
         if (!habbo.getRoomUnit().isTeleporting)
         {
-            habbo.getRoomUnit().setLocation(room.getLayout().getTile(room.getLayout().getDoorX(), room.getLayout().getDoorY()));
+
             RoomTile doorTile = room.getLayout().getTile(room.getLayout().getDoorX(), room.getLayout().getDoorY());
 
             if (doorTile != null)
             {
+                habbo.getRoomUnit().setLocation(doorTile);
                 habbo.getRoomUnit().setZ(doorTile.getStackHeight());
             }