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 '1-pathfinder-and-teleport' into 'dev'

Browse Source 
Resolve Pathfinder range limitation

See merge request morningstar/Arcturus-Community!6
This commit is contained in:
Beny 2019-05-04 06:49:55 -04:00
commit 83fcc87a88
2 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java
View File

@ -1,6 +1,9 @@
package com.eu.habbo.habbohotel.rooms;
import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.bots.Bot;
import com.eu.habbo.habbohotel.pets.Pet;
import com.eu.habbo.habbohotel.users.Habbo;
import gnu.trove.set.hash.THashSet;
import java.awt.*;
@ -271,10 +274,24 @@ public class RoomLayout
openList.add(oldTile.copy());
List<RoomTile> unitsAt = new ArrayList<>();
for(Bot b : this.room.getCurrentBots().valueCollection()) {
unitsAt.add(b.getRoomUnit().getCurrentLocation());
}
for(Habbo b : this.room.getCurrentHabbos().values()) {
unitsAt.add(b.getRoomUnit().getCurrentLocation());
}
for(Pet b : this.room.getCurrentPets().valueCollection()) {
unitsAt.add(b.getRoomUnit().getCurrentLocation());
}
long startMillis = System.currentTimeMillis();
while (true)
{
if (System.currentTimeMillis() - startMillis > 25)
if (System.currentTimeMillis() - startMillis > 50)
{
return new LinkedList<>();
}
@ -294,9 +311,7 @@ public class RoomLayout
if (closedList.contains(currentAdj)) continue;
//If the tile is sitable or layable and its not our goal tile, we cannot walk over it.
if (
(currentAdj.state == RoomTileState.BLOCKED) ||
((currentAdj.state == RoomTileState.SIT || currentAdj.state == RoomTileState.LAY) && !currentAdj.equals(goalLocation)))
if (!currentAdj.equals(goalLocation) && (currentAdj.state == RoomTileState.BLOCKED || currentAdj.state == RoomTileState.SIT || currentAdj.state == RoomTileState.LAY))
{
closedList.add(currentAdj);
openList.remove(currentAdj);
@ -311,10 +326,10 @@ public class RoomLayout
if (!ALLOW_FALLING && height < - MAXIMUM_STEP_HEIGHT) continue;
//If the step difference is bigger than the maximum step height, continue.
if (height > MAXIMUM_STEP_HEIGHT && currentAdj.state == RoomTileState.OPEN) continue;
if (currentAdj.state == RoomTileState.OPEN && height > MAXIMUM_STEP_HEIGHT) continue;
//Check if the tile has habbos.
if (!this.room.isAllowWalkthrough() && this.room.hasHabbosAt(currentAdj.x, currentAdj.y))
if (unitsAt.contains(currentAdj) && (!this.room.isAllowWalkthrough() || currentAdj.equals(goalLocation)))
{
closedList.add(currentAdj);
openList.remove(currentAdj);
@ -392,11 +407,14 @@ public class RoomLayout
return null;
RoomTile cheapest = openList.get(0);
int cheapestFcost = Integer.MAX_VALUE;
for (RoomTile anOpenList : openList)
{
if (anOpenList.getfCosts() < cheapest.getfCosts())
int f = cheapest.getfCosts();
if (anOpenList.getfCosts() < cheapestFcost)
{
cheapest = anOpenList;
cheapestFcost = f;
}
}
return cheapest;

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

@ -54,6 +54,7 @@ public class RoomUnit
public int kickCount = 0;
private boolean statusUpdate = false;
private boolean invisible = false;
private boolean lastCycleStatus = false;
private final ConcurrentHashMap<RoomUnitStatus, String> status;
private final THashMap<String, Object> cacheable;
@ -117,21 +118,31 @@ public class RoomUnit
return false;
}
Boolean isRiding = false;
Habbo rider = null;
if(this.getRoomUnitType() == RoomUnitType.PET) {
Pet pet = room.getPet(this);
if(pet != null) {
if(pet instanceof RideablePet) {
isRiding = true;
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;
rider = ((RideablePet) pet).getRider();
}
}
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)
{
@ -182,11 +193,9 @@ public class RoomUnit
if (next != null && room.hasHabbosAt(next.x, next.y))
{
if(!isRiding) {
return false;
}
}
}
Deque<RoomTile> peekPath = room.getLayout().findPath(this.currentLocation, this.path.peek(), this.goalLocation);
if (peekPath.size() >= 3)
@ -283,10 +292,10 @@ public class RoomUnit
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);
return false;
}
}*/
if (habbo != null)
{