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

Optimise Mob.walkTo for paths that require no verification

Browse Source
This commit is contained in:
Major
2018-04-01 20:42:13 +01:00
parent 7ca09f462b
commit 8394a035c7
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/plugin/entity/walk-to/src/walk_to.kt
+14 -7
View File
@@ -2,7 +2,10 @@ package org.apollo.plugin.entity.walkto
import org.apollo.game.model.Direction
import org.apollo.game.model.Position
import org.apollo.game.model.entity.*
import org.apollo.game.model.entity.Entity
import org.apollo.game.model.entity.Mob
import org.apollo.game.model.entity.Npc
import org.apollo.game.model.entity.Player
import org.apollo.game.model.entity.obj.GameObject
import org.apollo.game.model.entity.path.SimplePathfindingAlgorithm
@@ -41,7 +44,7 @@ fun Mob.walkBehind(target: Mob) {
walkTo(target, target.lastDirection.opposite())
}
fun Mob.walkTo(target: Position, positionPredicate: (Position) -> Boolean = { true }) {
fun Mob.walkTo(target: Position, positionPredicate: ((Position) -> Boolean)? = null) {
if (position == target) {
return
}
@@ -49,11 +52,15 @@ fun Mob.walkTo(target: Position, positionPredicate: (Position) -> Boolean = { tr
val pathfinder = SimplePathfindingAlgorithm(world.collisionManager)
val path = pathfinder.find(position, target)
for (step in path) {
if (!positionPredicate.invoke(step)) {
return
}
if (positionPredicate == null) {
path.forEach(walkingQueue::addStep)
} else {
for (step in path) {
if (!positionPredicate.invoke(step)) {
return
}
walkingQueue.addStep(step)
walkingQueue.addStep(step)
}
}
}