[PR #658] Improve NPC size > 1 pathing #691

New Issue

2026-05-15T02:58:16Z

Dark98 commented

2026-05-15 02:58:16 +00:00

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/658
Author: @ipkpjersi
Created: 9/21/2024
Status: 🔄 Open

Base: master ← Head: npc-size-pathing

📝 Commits (10+)

454ce9c Added NPC combat pathing for size > 1 NPCs
9825996 Added back NPC spawns
a523c5a Use consistent check for distance
49b7e80 Revert "Use consistent check for distance"
ac81428 Fixed attacking NPCs from too far
0295271 Fix for last commit
d2f48c2 Revert "Fix for last commit"
912f14a Added comment
61d6d26 Reverted additional size in player npc follow
c1af2ad Fixed typo

📊 Changes

7 files changed (+109 additions, -25 deletions)

View changed files

📝 2006Scape Server/data/cfg/spawns.json (+40 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java (+19 -8)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java (+3 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java (+28 -9)
📝 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java (+11 -2)
📝 2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java (+3 -5)
📝 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickNPC.java (+5 -1)

📄 Description

Wow, this was a ton of effort to clean up this PR but I think I did it properly. I tried many things, but ultimately I had to interactive rebase and just drop the commits I didn't want that were from other branches. My old PR I closed was 7 files changed and this new PR is 7 files changed, so it's extremely likely I did clean up this branch properly.

Anyway, onto this feature:

This is probably fine to merge. It doesn't fix all pathing bugs that currently exist (it doesn't fix player clipping when moving/attacking/clicking on objects etc), that would likely be a ton of work, but this does address not handling NPC size > 1 pathing, and it doesn't seem to introduce any new bugs.

~~With that said, I'll go ahead and mark this as draft for now so we can make sure it gets tested more first since I don't really consider it completely fully tested.~~ Marked as ready, we can review it/merge it whenever.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/2006-Scape/2006Scape/pull/658 **Author:** [@ipkpjersi](https://github.com/ipkpjersi) **Created:** 9/21/2024 **Status:** 🔄 Open **Base:** `master` ← **Head:** `npc-size-pathing` --- ### 📝 Commits (10+) - [`454ce9c`](https://github.com/2006-Scape/2006Scape/commit/454ce9ced71c6224b578f43bfa2a04708b2c2c3d) Added NPC combat pathing for size > 1 NPCs - [`9825996`](https://github.com/2006-Scape/2006Scape/commit/9825996f73b005dc33745d13d6640487c6a02fe6) Added back NPC spawns - [`a523c5a`](https://github.com/2006-Scape/2006Scape/commit/a523c5ac86ca3a16eec48dfeec35ce83235e2aa7) Use consistent check for distance - [`49b7e80`](https://github.com/2006-Scape/2006Scape/commit/49b7e801dade0906ba55033a751c29918917a726) Revert "Use consistent check for distance" - [`ac81428`](https://github.com/2006-Scape/2006Scape/commit/ac814283d672a51ad93c47f341cb88351d5ed713) Fixed attacking NPCs from too far - [`0295271`](https://github.com/2006-Scape/2006Scape/commit/0295271930672a2d3a3cb520e355dfe0f8536d01) Fix for last commit - [`d2f48c2`](https://github.com/2006-Scape/2006Scape/commit/d2f48c2638f6459e3881de5b22e6976d69fdc2ee) Revert "Fix for last commit" - [`912f14a`](https://github.com/2006-Scape/2006Scape/commit/912f14af990e2f69bd9a8527f080c20c65557f41) Added comment - [`61d6d26`](https://github.com/2006-Scape/2006Scape/commit/61d6d26265f2dc3afa41a0251e1ea37c575f1ca8) Reverted additional size in player npc follow - [`c1af2ad`](https://github.com/2006-Scape/2006Scape/commit/c1af2adf4691e09b886974df47b3ffff1012fff9) Fixed typo ### 📊 Changes **7 files changed** (+109 additions, -25 deletions) <details> <summary>View changed files</summary> 📝 `2006Scape Server/data/cfg/spawns.json` (+40 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java` (+19 -8) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java` (+3 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java` (+28 -9) 📝 `2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java` (+11 -2) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java` (+3 -5) 📝 `2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickNPC.java` (+5 -1) </details> ### 📄 Description Wow, this was a ton of effort to clean up this PR but I think I did it properly. I tried many things, but ultimately I had to interactive rebase and just drop the commits I didn't want that were from other branches. My old PR I closed was 7 files changed and this new PR is 7 files changed, so it's extremely likely I did clean up this branch properly. Anyway, onto this feature: This is probably fine to merge. It doesn't fix all pathing bugs that currently exist (it doesn't fix player clipping when moving/attacking/clicking on objects etc), that would likely be a ton of work, but this does address not handling NPC size > 1 pathing, and it doesn't seem to introduce any new bugs. ~~With that said, I'll go ahead and mark this as draft for now so we can make sure it gets tested more first since I don't really consider it completely fully tested.~~ Marked as ready, we can review it/merge it whenever. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

Dark98 added the pull-request label 2026-05-15 02:58:16 +00:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: 2006-Scape/2006Scape#691