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

[PR #659] [MERGED] Refactoring follow player/NPC variables and NPC magic numbers #14321

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

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/659
Author: @ipkpjersi
Created: 10/29/2024
Status: ✅ Merged
Merged: 12/6/2024
Merged by: @Dark98

Base: master ← Head: more-refactoring

📝 Commits (7)

  • 0248ee9 Refactoring follow player/NPC variables
  • 2284267 Magic number refactoring
  • 62f862e Added more NPC refactoring
  • 778c15d More NPC refactoring
  • 4892b03 More refactoring and removed GWD NPCs
  • 3a09692 Removed more GWD NPCs
  • 6e85220 Refactored remaining NPC IDs

📊 Changes

14 files changed (+305 additions, -428 deletions)

View changed files

📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java (+32 -30)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java (+51 -118)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java (+11 -10)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/range/DwarfCannon.java (+2 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Alchemy.java (+2 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Stalls.java (+3 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java (+62 -94)
📝 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java (+117 -149)
📝 2006Scape Server/src/main/java/com/rs2/game/players/Player.java (+4 -4)
📝 2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java (+15 -15)
📝 2006Scape Server/src/main/java/com/rs2/net/packets/impl/AttackPlayer.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickNPC.java (+3 -2)
📝 2006Scape Server/src/main/java/com/rs2/net/packets/impl/FollowPlayer.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Walking.java (+1 -1)

📄 Description

This one PR makes this code base so much more workable.

For example, I discovered that there was a bunch of GWD code in here, despite the fact that GWD wasn't added until 2007 not 2006.

Once this gets merged first I'll have to fix the merge conflicts in #658 after.

🔄 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/659 **Author:** [@ipkpjersi](https://github.com/ipkpjersi) **Created:** 10/29/2024 **Status:** ✅ Merged **Merged:** 12/6/2024 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `more-refactoring` --- ### 📝 Commits (7) - [`0248ee9`](https://github.com/2006-Scape/2006Scape/commit/0248ee9861b38148f16309fe795dc842b989c242) Refactoring follow player/NPC variables - [`2284267`](https://github.com/2006-Scape/2006Scape/commit/2284267a06cd251913c8d3e6bd90cdafc9b3600d) Magic number refactoring - [`62f862e`](https://github.com/2006-Scape/2006Scape/commit/62f862e9747d8d3bf0fc2c80784219a3bd063a09) Added more NPC refactoring - [`778c15d`](https://github.com/2006-Scape/2006Scape/commit/778c15d355fbf1f54aefc8e4f07f521d2020054e) More NPC refactoring - [`4892b03`](https://github.com/2006-Scape/2006Scape/commit/4892b038b955be98830ce589722a99c8bb5b632b) More refactoring and removed GWD NPCs - [`3a09692`](https://github.com/2006-Scape/2006Scape/commit/3a09692b394614b49be3f4454f08e8ad60170e37) Removed more GWD NPCs - [`6e85220`](https://github.com/2006-Scape/2006Scape/commit/6e852204e6adf95b270b2643499b3f2368f4e993) Refactored remaining NPC IDs ### 📊 Changes **14 files changed** (+305 additions, -428 deletions) <details> <summary>View changed files</summary> 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java` (+32 -30) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java` (+51 -118) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java` (+11 -10) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/range/DwarfCannon.java` (+2 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Alchemy.java` (+2 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Stalls.java` (+3 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java` (+62 -94) 📝 `2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java` (+117 -149) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/Player.java` (+4 -4) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java` (+15 -15) 📝 `2006Scape Server/src/main/java/com/rs2/net/packets/impl/AttackPlayer.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickNPC.java` (+3 -2) 📝 `2006Scape Server/src/main/java/com/rs2/net/packets/impl/FollowPlayer.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/net/packets/impl/Walking.java` (+1 -1) </details> ### 📄 Description This one PR makes this code base so much more workable. For example, I discovered that there was a bunch of GWD code in here, despite the fact that GWD wasn't added until 2007 not 2006. Once this gets merged first I'll have to fix the merge conflicts in #658 after. --- <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:36 +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
Highest Priority of Type
New Content
New Content
QoL
enhancement
pull-request
Mirrored from GitHub Pull Request
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
Dark98
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: 2006-Scape/2006Scape#14321