nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-07-02 13:35:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix sometimes incorrect Habbo height on item pickup

Browse Source
This commit is contained in:
Beny 2020-05-03 00:33:02 +02:00
parent 1b97707bc7
commit c590e49ff1
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -735,23 +735,22 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
THashSet<RoomUnit> roomUnits = new THashSet<>(); THashSet<RoomUnit> roomUnits = new THashSet<>();
for (Habbo habbo : habbos) { for (Habbo habbo : habbos) {
double z = habbo.getRoomUnit().getCurrentLocation().getStackHeight();
if ((item == null && !habbo.getRoomUnit().cmdSit) || (item != null && !item.getBaseItem().allowSit())) if ((item == null && !habbo.getRoomUnit().cmdSit) || (item != null && !item.getBaseItem().allowSit()))
habbo.getRoomUnit().removeStatus(RoomUnitStatus.SIT); habbo.getRoomUnit().removeStatus(RoomUnitStatus.SIT);
if ((item == null && !habbo.getRoomUnit().cmdLay) || (item != null && !item.getBaseItem().allowLay())) if ((item == null && !habbo.getRoomUnit().cmdLay) || (item != null && !item.getBaseItem().allowLay()))
habbo.getRoomUnit().removeStatus(RoomUnitStatus.LAY); habbo.getRoomUnit().removeStatus(RoomUnitStatus.LAY);
if (item != null) { if (item != null && (item.getBaseItem().allowSit() || item.getBaseItem().allowLay())) {
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()); habbo.getRoomUnit().setRotation(RoomUserRotation.fromValue(item.getRotation()));
habbo.getRoomUnit().setRotation(RoomUserRotation.fromValue(item.getRotation()));
} else {
habbo.getRoomUnit().setZ(item.getZ() + Item.getCurrentHeight(item));
}
} else { } else {
habbo.getRoomUnit().setZ(habbo.getRoomUnit().getCurrentLocation().getStackHeight()); habbo.getRoomUnit().setZ(z);
habbo.getRoomUnit().setPreviousLocationZ(habbo.getRoomUnit().getCurrentLocation().getStackHeight()); habbo.getRoomUnit().setPreviousLocationZ(z);
} }
roomUnits.add(habbo.getRoomUnit()); roomUnits.add(habbo.getRoomUnit());
} }