From 44b7b25b43ca12848ef3fe242db34d6617072c79 Mon Sep 17 00:00:00 2001
From: Beny <beny@krews.org>
Date: Mon, 2 Nov 2020 03:10:13 +0100
Subject: [PATCH] Fixed NPE in Room.getItemsAt Closes #881 #883

---
 src/main/java/com/eu/habbo/habbohotel/rooms/Room.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
index 0008862c..1840a150 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
@@ -3396,9 +3396,9 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
             return items;
 
         if (this.loaded) {
-            if (this.tileCache.containsKey(tile)) {
-                return this.tileCache.get(tile);
-            }
+            THashSet<HabboItem> cachedItems = this.tileCache.get(tile);
+            if(cachedItems != null)
+                return cachedItems;
         }
 
         TIntObjectIterator<HabboItem> iterator = this.roomItems.iterator();