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

[PR #649] [CLOSED] Added NPC size > 1 pathing #14312

New Issue
Closed
opened 2026-06-07 12:23:34 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-06-07 12:23:34 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/649
Author: @ipkpjersi
Created: 12/31/2023
Status: ❌ Closed

Base: master ← Head: npc-size-pathing

📝 Commits (10+)

  • 4af67b7 Added more client settings for winter and hide roofs
  • 1a0b757 Removed unnecessary local var and added Javadoc comment
  • 0d87125 Fixed dark wizards casting magic in melee range
  • 0baf36b Added AttackType enum
  • 1d011a7 Removed extra asterisk
  • 8400301 Removed attackType magic numbers
  • bef350b Enabled snow toggles by default
  • 79cb74c Combined snow month into one variable
  • 94658f0 Added option for fixes without custom settings
  • 2cb4f25 Added more main args

📊 Changes

22 files changed (+134586 additions, -134380 deletions)

View changed files

📝 2006Scape Client/src/main/java/ClientSettings.java (+30 -0)
📝 2006Scape Client/src/main/java/Flo.java (+1 -1)
📝 2006Scape Client/src/main/java/Game.java (+26 -8)
📝 2006Scape Client/src/main/java/Main.java (+23 -1)
📝 2006Scape Client/src/main/java/ObjectManager.java (+6 -2)
➕ 2006Scape Server/data/cfg/npcDefinitions.json (+134246 -0)
➖ 2006Scape Server/data/cfg/npcDefinitions.xml (+0 -134240)
➕ 2006Scape Server/plugins/plugin/buttons/gameframe/SoundVolumeButtons.java (+37 -0)
📝 2006Scape Server/src/main/java/com/rs2/GameEngine.java (+9 -9)
➕ 2006Scape Server/src/main/java/com/rs2/game/content/combat/AttackType.java (+18 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java (+14 -6)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java (+61 -57)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java (+6 -5)
📝 2006Scape Server/src/main/java/com/rs2/game/npcs/NPCDefinition.java (+19 -9)
📝 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java (+49 -26)
📝 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java (+23 -8)
📝 2006Scape Server/src/main/java/com/rs2/game/players/Player.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java (+3 -5)
📝 2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java (+5 -0)
📝 2006Scape Server/src/main/java/com/rs2/net/PacketSender.java (+3 -0)

...and 2 more files

📄 Description

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 fully ready or completely fully tested.

Also as a heads up, this is based off of my initial development branch PR, so that should probably get merged first before this one.

🔄 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/649 **Author:** [@ipkpjersi](https://github.com/ipkpjersi) **Created:** 12/31/2023 **Status:** ❌ Closed **Base:** `master` ← **Head:** `npc-size-pathing` --- ### 📝 Commits (10+) - [`4af67b7`](https://github.com/2006-Scape/2006Scape/commit/4af67b7a7b4617d881a91a98e6a4e4b6ec4db6cc) Added more client settings for winter and hide roofs - [`1a0b757`](https://github.com/2006-Scape/2006Scape/commit/1a0b757581e023791b14e17d823528654919129b) Removed unnecessary local var and added Javadoc comment - [`0d87125`](https://github.com/2006-Scape/2006Scape/commit/0d8712533e9fcdf5ddbf9fb0e47b8da752426633) Fixed dark wizards casting magic in melee range - [`0baf36b`](https://github.com/2006-Scape/2006Scape/commit/0baf36b485ad112c1a8895ca6b9cd9fa734fc784) Added AttackType enum - [`1d011a7`](https://github.com/2006-Scape/2006Scape/commit/1d011a7d281c4bafcfc9c2bb625d6a5f5696a631) Removed extra asterisk - [`8400301`](https://github.com/2006-Scape/2006Scape/commit/84003010de4d83f2499ee903995752fcda118a30) Removed attackType magic numbers - [`bef350b`](https://github.com/2006-Scape/2006Scape/commit/bef350b56be336059f00ab53e4ec42b6c2af797b) Enabled snow toggles by default - [`79cb74c`](https://github.com/2006-Scape/2006Scape/commit/79cb74c6fc7d4ac17d11d62d81a9572ac484cae9) Combined snow month into one variable - [`94658f0`](https://github.com/2006-Scape/2006Scape/commit/94658f0c002b248fdd6b524bc4506665f59cbc62) Added option for fixes without custom settings - [`2cb4f25`](https://github.com/2006-Scape/2006Scape/commit/2cb4f2571b04842f5746b08dd1188e675167e1d9) Added more main args ### 📊 Changes **22 files changed** (+134586 additions, -134380 deletions) <details> <summary>View changed files</summary> 📝 `2006Scape Client/src/main/java/ClientSettings.java` (+30 -0) 📝 `2006Scape Client/src/main/java/Flo.java` (+1 -1) 📝 `2006Scape Client/src/main/java/Game.java` (+26 -8) 📝 `2006Scape Client/src/main/java/Main.java` (+23 -1) 📝 `2006Scape Client/src/main/java/ObjectManager.java` (+6 -2) ➕ `2006Scape Server/data/cfg/npcDefinitions.json` (+134246 -0) ➖ `2006Scape Server/data/cfg/npcDefinitions.xml` (+0 -134240) ➕ `2006Scape Server/plugins/plugin/buttons/gameframe/SoundVolumeButtons.java` (+37 -0) 📝 `2006Scape Server/src/main/java/com/rs2/GameEngine.java` (+9 -9) ➕ `2006Scape Server/src/main/java/com/rs2/game/content/combat/AttackType.java` (+18 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java` (+14 -6) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java` (+61 -57) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java` (+6 -5) 📝 `2006Scape Server/src/main/java/com/rs2/game/npcs/NPCDefinition.java` (+19 -9) 📝 `2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java` (+49 -26) 📝 `2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java` (+23 -8) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/Player.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java` (+3 -5) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java` (+5 -0) 📝 `2006Scape Server/src/main/java/com/rs2/net/PacketSender.java` (+3 -0) _...and 2 more files_ </details> ### 📄 Description 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 fully ready or completely fully tested. Also as a heads up, this is based off of my initial `development` branch PR, so that should probably get merged first before this one. --- <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-06-07 12:23:34 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Cannot Reproduce
Difficulty: Easy
Difficulty: Easy
Difficulty: Hard
Difficulty: Medium
Documentation
enhancement
Highest Priority of Type
New Content
New Content
pull-request
Mirrored from GitHub Pull Request
 QoL
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Dark98
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: 2006-Scape/2006Scape#14312
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?