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 b800d9a7..3bb46a63 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -4047,6 +4047,9 @@ public class Room implements Comparable, ISerialize, Runnable THashSet items = new THashSet<>(0); + if (tile == null) + return items; + TIntObjectIterator iterator = this.roomItems.iterator(); for (int i = this.roomItems.size(); i-- > 0; ) @@ -4062,6 +4065,9 @@ public class Room implements Comparable, ISerialize, Runnable break; } + if (item == null) + continue; + if (item.getBaseItem().getType() != FurnitureType.FLOOR) continue;