nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-23 07:20:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '51-roller-no-rules-doesn-t-work' into 'dev'

Browse Source 
Resolve "Roller No Rules doesn't work."

See merge request morningstar/Arcturus-Community!13
This commit is contained in:
Harmonic 2019-05-08 21:02:17 -04:00
commit d08795159f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
View File

@ -1596,8 +1596,10 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
for(HabboItem item : getItemsAt(rollerTile)) for(HabboItem item : getItemsAt(rollerTile))
{ {
if(item.getZ() >= roller.getZ() + roller.getBaseItem().getHeight()) {
itemsOnRoller.add(item); itemsOnRoller.add(item);
} }
}
itemsOnRoller.remove(roller); itemsOnRoller.remove(roller);
@ -1612,7 +1614,6 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
if (tileInFront == null) if (tileInFront == null)
return true; return true;
if (!Room.this.layout.tileExists(tileInFront.x, tileInFront.y)) if (!Room.this.layout.tileExists(tileInFront.x, tileInFront.y))
return true; return true;
@ -1758,7 +1759,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
messages.clear(); messages.clear();
} }
if ((allowFurniture || !stackContainsRoller) && !InteractionRoller.NO_RULES) if (allowFurniture || !stackContainsRoller || InteractionRoller.NO_RULES)
{ {
Event furnitureRolledEvent = null; Event furnitureRolledEvent = null;