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

Fixed horse to work with walk through

Browse Source
This commit is contained in:
Beny 2019-05-04 11:15:45 +01:00
parent 36a0f848d2
commit 7a60b97ecd
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java
View File

@ -54,6 +54,7 @@ public class RoomUnit
public int kickCount = 0; public int kickCount = 0;
private boolean statusUpdate = false; private boolean statusUpdate = false;
private boolean invisible = false; private boolean invisible = false;
private boolean lastCycleStatus = false;
private final ConcurrentHashMap<RoomUnitStatus, String> status; private final ConcurrentHashMap<RoomUnitStatus, String> status;
private final THashMap<String, Object> cacheable; private final THashMap<String, Object> cacheable;
@ -117,22 +118,32 @@ public class RoomUnit
return false; return false;
} }
Boolean isRiding = false; Habbo rider = null;
Pet pet = room.getPet(this); if(this.getRoomUnitType() == RoomUnitType.PET) {
if(pet != null) { Pet pet = room.getPet(this);
if(pet instanceof RideablePet) { if(pet instanceof RideablePet) {
isRiding = true; rider = ((RideablePet) pet).getRider();
if (((RideablePet) pet).getRider() != null) {
if(!((RideablePet) pet).getRider().getRoomUnit().isWalking()) {
this.status.remove(RoomUnitStatus.MOVE);
this.setCurrentLocation(((RideablePet) pet).getRider().getRoomUnit().getPreviousLocation());
if (this.status.remove(RoomUnitStatus.MOVE) != null) this.statusUpdate = true;
}
}
} }
} }
if(rider != null) {
// copy things from rider
if(this.status.containsKey(RoomUnitStatus.MOVE) && !rider.getRoomUnit().getStatusMap().containsKey(RoomUnitStatus.MOVE)) {
this.status.remove(RoomUnitStatus.MOVE);
}
if(rider.getRoomUnit().getCurrentLocation().x != this.getX() || rider.getRoomUnit().getCurrentLocation().y != this.getY()) {
this.status.put(RoomUnitStatus.MOVE, rider.getRoomUnit().getCurrentLocation().x + "," + rider.getRoomUnit().getCurrentLocation().y + "," + (rider.getRoomUnit().getCurrentLocation().getStackHeight()));
this.setPreviousLocation(rider.getRoomUnit().getPreviousLocation());
this.setPreviousLocationZ(rider.getRoomUnit().getPreviousLocation().getStackHeight());
this.setCurrentLocation(rider.getRoomUnit().getCurrentLocation());
this.setZ(rider.getRoomUnit().getCurrentLocation().getStackHeight());
}
return this.statusUpdate;
}
if (!this.isWalking() && !this.isKicked) if (!this.isWalking() && !this.isKicked)
{ {
if (this.status.remove(RoomUnitStatus.MOVE) == null) if (this.status.remove(RoomUnitStatus.MOVE) == null)
@ -182,9 +193,7 @@ public class RoomUnit
if (next != null && room.hasHabbosAt(next.x, next.y)) if (next != null && room.hasHabbosAt(next.x, next.y))
{ {
if(!isRiding) { return false;
return false;
}
} }
} }
@ -283,10 +292,10 @@ public class RoomUnit
double zHeight = 0.0D; double zHeight = 0.0D;
if (((habbo != null && habbo.getHabboInfo().getRiding() != null) || isRiding) && next.equals(this.goalLocation) && (next.state == RoomTileState.SIT || next.state == RoomTileState.LAY)) { /*if (((habbo != null && habbo.getHabboInfo().getRiding() != null) || isRiding) && next.equals(this.goalLocation) && (next.state == RoomTileState.SIT || next.state == RoomTileState.LAY)) {
this.status.remove(RoomUnitStatus.MOVE); this.status.remove(RoomUnitStatus.MOVE);
return false; return false;
} }*/
if (habbo != null) if (habbo != null)
{ {