From 766fa148d085b57e00a2056faa76bbd85f3429af Mon Sep 17 00:00:00 2001
From: Alejandro <25-alejandro@users.noreply.git.krews.org>
Date: Sun, 26 May 2019 21:49:15 +0300
Subject: [PATCH] Fix NullPointerException in RoomRelativeMapComposer

---
 .../com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java    | 2 +-
 .../messages/incoming/rooms/RequestRoomHeightmapEvent.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java
index a827507d..073b2517 100644
--- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java
+++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java
@@ -19,7 +19,7 @@ public class UpdateItemsCommand extends Command {
 
         synchronized (Emulator.getGameEnvironment().getRoomManager().getActiveRooms()) {
             for (Room room : Emulator.getGameEnvironment().getRoomManager().getActiveRooms()) {
-                if (room.isLoaded() && room.getUserCount() > 0) {
+                if (room.isLoaded() && room.getUserCount() > 0 && room.getLayout() != null) {
                     room.sendComposer(new RoomRelativeMapComposer(room).compose());
                 }
             }
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java
index 6e281ce2..294f2873 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java
@@ -12,7 +12,7 @@ public class RequestRoomHeightmapEvent extends MessageHandler {
         if (this.client.getHabbo().getHabboInfo().getLoadingRoom() > 0) {
             Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(this.client.getHabbo().getHabboInfo().getLoadingRoom());
 
-            if (room != null) {
+            if (room != null && room.getLayout() != null) {
                 this.client.sendResponse(new RoomRelativeMapComposer(room));
 
                 this.client.sendResponse(new RoomHeightMapComposer(room));