imshvc/noxious_server
1
0
Fork 0
forked from noxious/server
Code Pull Requests Activity

Stop current pathfinding task if a new one is initialized to prevent glitches

Browse Source
This commit is contained in:
Dennis Postma 2024-08-03 18:31:41 +02:00
parent 535bb36edc
commit eb4cbb5e9e
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/events/character/Move.ts
View File

@ -11,6 +11,9 @@ interface SocketResponse {
position_y: number position_y: number
} }
// Add a cancellation token
let currentMoveToken: Symbol | null = null
export default function setupCharacterMove(socket: TSocket, io: Server) { export default function setupCharacterMove(socket: TSocket, io: Server) {
socket.on('character:move', async (data: SocketResponse) => { socket.on('character:move', async (data: SocketResponse) => {
try { try {
@ -21,6 +24,10 @@ export default function setupCharacterMove(socket: TSocket, io: Server) {
return return
} }
// Cancel any ongoing movement
currentMoveToken = Symbol('moveToken')
const moveToken = currentMoveToken
const grid = await ZoneManager.getGrid(socket.character.zoneId) const grid = await ZoneManager.getGrid(socket.character.zoneId)
if (grid.length === 0) { if (grid.length === 0) {
@ -37,10 +44,12 @@ export default function setupCharacterMove(socket: TSocket, io: Server) {
socket.character.isMoving = true socket.character.isMoving = true
io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character) io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character)
try { try {
await moveAlongPath(socket, io, path, grid) await moveAlongPath(socket, io, path, grid, moveToken)
} finally { } finally {
socket.character.isMoving = false if (currentMoveToken === moveToken) {
io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character) socket.character.isMoving = false
io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character)
}
} }
} else { } else {
console.log('character:move error', 'No valid path found') console.log('character:move error', 'No valid path found')
@ -55,10 +64,16 @@ export default function setupCharacterMove(socket: TSocket, io: Server) {
}) })
} }
async function moveAlongPath(socket: TSocket, io: Server, path: Node[], grid: number[][]) { async function moveAlongPath(socket: TSocket, io: Server, path: Node[], grid: number[][], moveToken: Symbol) {
if (!socket.character) return if (!socket.character) return
for (let i = 0; i < path.length; i++) { for (let i = 0; i < path.length; i++) {
// Check if this movement has been cancelled
if (currentMoveToken !== moveToken) {
console.log('Movement cancelled, stopping current path')
return
}
const position = path[i] const position = path[i]
if (isObstacle(position, grid)) { if (isObstacle(position, grid)) {
console.log('Obstacle encountered at', position) console.log('Obstacle encountered at', position)