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 #215] [MERGED] Some more minor clean up #12011

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

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/215
Author: @mrextremez
Created: 11/26/2019
Status: ✅ Merged
Merged: 11/28/2019
Merged by: @dginovker

Base: master ← Head: morecleanup

📝 Commits (5)

📊 Changes

32 files changed (+1666 additions, -2124 deletions)

View changed files

📝 2006Redone Server/src/com/rebotted/GameConstants.java (+16 -12)
📝 2006Redone Server/src/com/rebotted/game/bots/BotHandler.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java (+38 -77)
➕ 2006Redone Server/src/com/rebotted/game/content/combat/CombatConstants.java (+35 -0)
📝 2006Redone Server/src/com/rebotted/game/content/combat/Specials.java (+25 -50)
📝 2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicSpells.java (+4 -4)
📝 2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcCombat.java (+4 -3)
📝 2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java (+2 -2)
📝 2006Redone Server/src/com/rebotted/game/content/randomevents/RandomEventHandler.java (+1 -3)
➕ 2006Redone Server/src/com/rebotted/game/content/skills/SkillData.java (+136 -0)
📝 2006Redone Server/src/com/rebotted/game/content/skills/SkillHandler.java (+0 -9)
📝 2006Redone Server/src/com/rebotted/game/content/skills/agility/AgilityShortcut.java (+1 -2)
📝 2006Redone Server/src/com/rebotted/game/content/skills/core/Mining.java (+3 -4)
📝 2006Redone Server/src/com/rebotted/game/content/skills/core/Woodcutting.java (+95 -59)
➕ 2006Redone Server/src/com/rebotted/game/dialogues/DialogueOptions.java (+738 -0)
📝 2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleGates.java (+109 -68)
📝 2006Redone Server/src/com/rebotted/game/globalworldobjects/GateHandler.java (+78 -72)
📝 2006Redone Server/src/com/rebotted/game/globalworldobjects/SingleGates.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java (+123 -230)
📝 2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java (+3 -9)

...and 12 more files

📄 Description

  • Reduced woodcutting code by a lot, cleaned it up and converted the array to an enum
  • Moved the login player method to the packet sender
  • Deleted some dead code/cleaned up some things
  • Moved combat constants from gameconstants.java to combatconstants.java
  • Moved dialogue options from clickingbuttons.java to dialogueoptions.java

🔄 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/215 **Author:** [@mrextremez](https://github.com/mrextremez) **Created:** 11/26/2019 **Status:** ✅ Merged **Merged:** 11/28/2019 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `morecleanup` --- ### 📝 Commits (5) - [`945152a`](https://github.com/2006-Scape/2006Scape/commit/945152aafe36aa3176604772078c9cddf6d810ca) General clean up - [`f7faa3d`](https://github.com/2006-Scape/2006Scape/commit/f7faa3dffa508270bf23cfca2d7520cf7e557791) More random cleanup/refractoring - [`a6e9213`](https://github.com/2006-Scape/2006Scape/commit/a6e92134c1fb774c20b4eaaddfbd4a8dda421985) Replaced some poorly written methods - [`6a87692`](https://github.com/2006-Scape/2006Scape/commit/6a87692729136c90a40679a1dfe7db4200a39dfb) Fight caves - [`4dd2a46`](https://github.com/2006-Scape/2006Scape/commit/4dd2a46b8d6725e82ed2582458b1c783bb38a61d) Gates ### 📊 Changes **32 files changed** (+1666 additions, -2124 deletions) <details> <summary>View changed files</summary> 📝 `2006Redone Server/src/com/rebotted/GameConstants.java` (+16 -12) 📝 `2006Redone Server/src/com/rebotted/game/bots/BotHandler.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java` (+38 -77) ➕ `2006Redone Server/src/com/rebotted/game/content/combat/CombatConstants.java` (+35 -0) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/Specials.java` (+25 -50) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicSpells.java` (+4 -4) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcCombat.java` (+4 -3) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java` (+2 -2) 📝 `2006Redone Server/src/com/rebotted/game/content/randomevents/RandomEventHandler.java` (+1 -3) ➕ `2006Redone Server/src/com/rebotted/game/content/skills/SkillData.java` (+136 -0) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/SkillHandler.java` (+0 -9) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/agility/AgilityShortcut.java` (+1 -2) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/core/Mining.java` (+3 -4) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/core/Woodcutting.java` (+95 -59) ➕ `2006Redone Server/src/com/rebotted/game/dialogues/DialogueOptions.java` (+738 -0) 📝 `2006Redone Server/src/com/rebotted/game/globalworldobjects/DoubleGates.java` (+109 -68) 📝 `2006Redone Server/src/com/rebotted/game/globalworldobjects/GateHandler.java` (+78 -72) 📝 `2006Redone Server/src/com/rebotted/game/globalworldobjects/SingleGates.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java` (+123 -230) 📝 `2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java` (+3 -9) _...and 12 more files_ </details> ### 📄 Description - Reduced woodcutting code by a lot, cleaned it up and converted the array to an enum - Moved the login player method to the packet sender - Deleted some dead code/cleaned up some things - Moved combat constants from gameconstants.java to combatconstants.java - Moved dialogue options from clickingbuttons.java to dialogueoptions.java --- <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-05 12:21:40 +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#12011
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?