From 1eda3d78fa6a83a7814d9b3bed57c985bd157dec Mon Sep 17 00:00:00 2001 From: KrewsOrg Date: Thu, 9 May 2019 02:01:31 +0100 Subject: [PATCH] Fixed hotel.room.rollers.norules. --- src/main/java/com/eu/habbo/habbohotel/rooms/Room.java | 7 ++++--- 1 file changed, 4 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 5b124022..66afe4f9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -1596,7 +1596,9 @@ public class Room implements Comparable, ISerialize, Runnable for(HabboItem item : getItemsAt(rollerTile)) { - itemsOnRoller.add(item); + if(item.getZ() >= roller.getZ() + roller.getBaseItem().getHeight()) { + itemsOnRoller.add(item); + } } itemsOnRoller.remove(roller); @@ -1612,7 +1614,6 @@ public class Room implements Comparable, ISerialize, Runnable if (tileInFront == null) return true; - if (!Room.this.layout.tileExists(tileInFront.x, tileInFront.y)) return true; @@ -1758,7 +1759,7 @@ public class Room implements Comparable, ISerialize, Runnable messages.clear(); } - if ((allowFurniture || !stackContainsRoller) && !InteractionRoller.NO_RULES) + if (allowFurniture || !stackContainsRoller || InteractionRoller.NO_RULES) { Event furnitureRolledEvent = null;