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 #640] [MERGED] Various fixes and improvements #3449

New Issue
Closed
opened 2026-05-24 12:21:47 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-05-24 12:21:47 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/640
Author: @ipkpjersi
Created: 12/19/2023
Status: ✅ Merged
Merged: 9/21/2024
Merged by: @Dark98

Base: master ← Head: develop

📝 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

57 files changed (+134757 additions, -134495 deletions)

View changed files

📝 2006Scape Client/src/main/java/ClientSettings.java (+41 -0)
📝 2006Scape Client/src/main/java/Flo.java (+1 -1)
📝 2006Scape Client/src/main/java/Game.java (+39 -10)
📝 2006Scape Client/src/main/java/Main.java (+18 -3)
📝 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/data/cfg/spawns.json (+0 -40)
➕ 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/npcs/NpcCombat.java (+68 -66)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java (+9 -8)
📝 2006Scape Server/src/main/java/com/rs2/game/content/minigames/Barrows.java (+0 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/BlackKnightsFortress.java (+7 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/CooksAssistant.java (+7 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/DoricsQuest.java (+7 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/GertrudesCat.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/LostCity.java (+7 -1)

...and 37 more files

📄 Description

No description provided

🔄 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/640 **Author:** [@ipkpjersi](https://github.com/ipkpjersi) **Created:** 12/19/2023 **Status:** ✅ Merged **Merged:** 9/21/2024 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `develop` --- ### 📝 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 **57 files changed** (+134757 additions, -134495 deletions) <details> <summary>View changed files</summary> 📝 `2006Scape Client/src/main/java/ClientSettings.java` (+41 -0) 📝 `2006Scape Client/src/main/java/Flo.java` (+1 -1) 📝 `2006Scape Client/src/main/java/Game.java` (+39 -10) 📝 `2006Scape Client/src/main/java/Main.java` (+18 -3) 📝 `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/data/cfg/spawns.json` (+0 -40) ➕ `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/npcs/NpcCombat.java` (+68 -66) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java` (+9 -8) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/minigames/Barrows.java` (+0 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/BlackKnightsFortress.java` (+7 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/CooksAssistant.java` (+7 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/DoricsQuest.java` (+7 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/GertrudesCat.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/LostCity.java` (+7 -1) _...and 37 more files_ </details> ### 📄 Description _No description provided_ --- <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-24 12:21:47 +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#3449
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?