Merge branch 'bed-fix' into 'dev'

Fix beds on rotate

See merge request morningstar/Arcturus-Community!26
This commit is contained in:
Beny 2019-05-12 14:45:50 -04:00
commit 22c6de843e

View File

@ -850,7 +850,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
if(item != null) if(item != null)
{ {
if(item.getBaseItem().allowSit()) if(item.getBaseItem().allowSit() || item.getBaseItem().allowLay())
{ {
habbo.getRoomUnit().setZ(item.getZ()); habbo.getRoomUnit().setZ(item.getZ());
habbo.getRoomUnit().setPreviousLocationZ(item.getZ()); habbo.getRoomUnit().setPreviousLocationZ(item.getZ());
@ -859,11 +859,6 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
else else
{ {
habbo.getRoomUnit().setZ(item.getZ() + Item.getCurrentHeight(item)); habbo.getRoomUnit().setZ(item.getZ() + Item.getCurrentHeight(item));
if (item.getBaseItem().allowLay())
{
habbo.getRoomUnit().setStatus(RoomUnitStatus.LAY, (item.getZ() + Item.getCurrentHeight(item)) + "");
}
} }
} }
else else