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

Merge branch 'fix-height-bot-onplace' into 'ms4/dev'

Browse Source 
Fix for bot not sitting at right height when placing on a chair, fixes issue #1999

See merge request morningstar/Arcturus-Community!41
This commit is contained in:
John 2023-01-16 23:05:17 +00:00
commit 0f3ca7807e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java
View File

@ -122,7 +122,7 @@ public class BotManager {
roomUnit.setRotation(RoomUserRotation.SOUTH); roomUnit.setRotation(RoomUserRotation.SOUTH);
roomUnit.setLocation(location); roomUnit.setLocation(location);
double stackHeight = location.getStackHeight(); double stackHeight = room.getTopHeightAt(location.getX(), location.getY());
roomUnit.setPreviousLocationZ(stackHeight); roomUnit.setPreviousLocationZ(stackHeight);
roomUnit.setZ(stackHeight); roomUnit.setZ(stackHeight);

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

@ -3063,12 +3063,12 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
public double getTopHeightAt(int x, int y) { public double getTopHeightAt(int x, int y) {
HabboItem item = this.getTopItemAt(x, y); HabboItem item = this.getTopItemAt(x, y);
if (item != null) {
if (item != null) return (item.getZ() + Item.getCurrentHeight(item) - (item.getBaseItem().allowSit() ? 1 : 0));
return (item.getZ() + Item.getCurrentHeight(item)); } else {
else
return this.layout.getHeightAtSquare(x, y); return this.layout.getHeightAtSquare(x, y);
} }
}
public HabboItem getLowestChair(RoomTile tile) { public HabboItem getLowestChair(RoomTile tile) {
HabboItem lowestChair = null; HabboItem lowestChair = null;