2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-07 16:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add walking path verification.

Browse Source
This commit is contained in:
Major-
2015-08-30 22:05:28 +01:00
parent a4186587df
commit 9368685bd7
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/src/main/org/apollo/game/model/entity/WalkingQueue.java
+18 -1
View File
@@ -6,6 +6,8 @@ import java.util.Queue;
import org.apollo.game.model.Direction; import org.apollo.game.model.Direction;
import org.apollo.game.model.Position; import org.apollo.game.model.Position;
import org.apollo.game.model.area.Region;
import org.apollo.game.model.area.RegionRepository;
/** /**
* A queue of {@link Direction}s which a {@link Mob} will follow. * A queue of {@link Direction}s which a {@link Mob} will follow.
@@ -175,6 +177,10 @@ public final class WalkingQueue {
int max = Math.max(Math.abs(deltaX), Math.abs(deltaY)); int max = Math.max(Math.abs(deltaX), Math.abs(deltaY));
RegionRepository repository = mob.getWorld().getRegionRepository();
Region region = repository.fromPosition(current);
Position previous = current;
for (int count = 0; count < max; count++) { for (int count = 0; count < max; count++) {
if (deltaX < 0) { if (deltaX < 0) {
deltaX++; deltaX++;
@@ -188,7 +194,18 @@ public final class WalkingQueue {
deltaY--; deltaY--;
} }
points.add(new Position(nextX - deltaX, nextY - deltaY, height)); Position step = new Position(nextX - deltaX, nextY - deltaY, height);
if (!region.contains(step)) {
region = repository.fromPosition(step);
}
Direction direction = Direction.between(previous, step);
if (!region.traversable(step, EntityType.PLAYER, direction)) {
break;
}
points.add(step);
previous = step;
} }
} }