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 #518] [MERGED] Second World Setup #4756

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

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/518
Author: @Dark98
Created: 11/12/2021
Status: ✅ Merged
Merged: 12/31/2021
Merged by: @Dark98

Base: master ← Head: world2

📝 Commits (10+)

  • 45450db Start Setting Up Second World
  • ccc0353 Small Cleanup For World 2 Support
  • 00932b8 Woops Wrong Ports
  • 8fc1e17 Merge branch 'master' into world2
  • 8ab3177 Set Server Port After Loading Config
  • bdd5297 Add xpRate Var & Include With XPRate Calculations
  • 8a10201 Add -w/-world arg to client
  • 38140d8 Add XP Rate Multiplier For Non-Bot Worlds
  • d2faea6 More Multi World Stuff
  • 5c02c34 Add Kick Command To Discord Bot & Fix Type In ConfigLoader

📊 Changes

32 files changed (+406 additions, -149 deletions)

View changed files

📝 2006Scape Client/src/main/java/ClientSettings.java (+16 -4)
📝 2006Scape Client/src/main/java/Game.java (+31 -20)
📝 2006Scape Client/src/main/java/Main.java (+14 -3)
📝 2006Scape Server/ServerConfig.Sample.json (+5 -2)
📝 2006Scape Server/data/cache/main_file_cache.dat (+0 -0)
📝 2006Scape Server/data/cache/main_file_cache.idx0 (+0 -0)
➖ 2006Scape Server/data/discord.json (+0 -1)
📝 2006Scape Server/src/main/java/com/rs2/ConfigLoader.java (+15 -2)
📝 2006Scape Server/src/main/java/com/rs2/GameConstants.java (+11 -18)
📝 2006Scape Server/src/main/java/com/rs2/GameEngine.java (+1 -4)
📝 2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java (+36 -4)
📝 2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java (+71 -3)
📝 2006Scape Server/src/main/java/com/rs2/game/players/Player.java (+41 -36)
📝 2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java (+7 -4)
📝 2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java (+4 -0)
📝 2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java (+9 -10)
📝 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java (+8 -9)
📝 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java (+2 -1)

...and 12 more files

📄 Description

Things Done So Far:
Added World Number To Login Message
Added World Number To Login Interface
Made World 2 Listen On Different Port
Added Var For Making Client Connect To World 2

🔄 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/518 **Author:** [@Dark98](https://github.com/Dark98) **Created:** 11/12/2021 **Status:** ✅ Merged **Merged:** 12/31/2021 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `world2` --- ### 📝 Commits (10+) - [`45450db`](https://github.com/2006-Scape/2006Scape/commit/45450dbb9ce395e768ea798b9df8c1fc44518ad2) Start Setting Up Second World - [`ccc0353`](https://github.com/2006-Scape/2006Scape/commit/ccc0353bad40dfd937e60e3c6cf52d36c91efde9) Small Cleanup For World 2 Support - [`00932b8`](https://github.com/2006-Scape/2006Scape/commit/00932b82ee8fc3da5820bebd9006779babaa667b) Woops Wrong Ports - [`8fc1e17`](https://github.com/2006-Scape/2006Scape/commit/8fc1e17a25a1b56f59a548818ff4bf6d74513693) Merge branch 'master' into world2 - [`8ab3177`](https://github.com/2006-Scape/2006Scape/commit/8ab31771b3a4234521f1e8ba4e13b6d103d1a88a) Set Server Port After Loading Config - [`bdd5297`](https://github.com/2006-Scape/2006Scape/commit/bdd5297a94cd38d88c1295e180b05f8ab0432a66) Add xpRate Var & Include With XPRate Calculations - [`8a10201`](https://github.com/2006-Scape/2006Scape/commit/8a102016374be271eac4234127a8638d059e2160) Add -w/-world arg to client - [`38140d8`](https://github.com/2006-Scape/2006Scape/commit/38140d8665879063e7c177feb9c37612d9dfdf82) Add XP Rate Multiplier For Non-Bot Worlds - [`d2faea6`](https://github.com/2006-Scape/2006Scape/commit/d2faea6f71b9bdb0011bd315fcb0a219316de216) More Multi World Stuff - [`5c02c34`](https://github.com/2006-Scape/2006Scape/commit/5c02c345693f12ffba8bda006eb14a5cc0b0e738) Add Kick Command To Discord Bot & Fix Type In ConfigLoader ### 📊 Changes **32 files changed** (+406 additions, -149 deletions) <details> <summary>View changed files</summary> 📝 `2006Scape Client/src/main/java/ClientSettings.java` (+16 -4) 📝 `2006Scape Client/src/main/java/Game.java` (+31 -20) 📝 `2006Scape Client/src/main/java/Main.java` (+14 -3) 📝 `2006Scape Server/ServerConfig.Sample.json` (+5 -2) 📝 `2006Scape Server/data/cache/main_file_cache.dat` (+0 -0) 📝 `2006Scape Server/data/cache/main_file_cache.idx0` (+0 -0) ➖ `2006Scape Server/data/discord.json` (+0 -1) 📝 `2006Scape Server/src/main/java/com/rs2/ConfigLoader.java` (+15 -2) 📝 `2006Scape Server/src/main/java/com/rs2/GameConstants.java` (+11 -18) 📝 `2006Scape Server/src/main/java/com/rs2/GameEngine.java` (+1 -4) 📝 `2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java` (+36 -4) 📝 `2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java` (+71 -3) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/Player.java` (+41 -36) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java` (+7 -4) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java` (+4 -0) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java` (+9 -10) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java` (+8 -9) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java` (+2 -1) _...and 12 more files_ </details> ### 📄 Description Things Done So Far: Added World Number To Login Message Added World Number To Login Interface Made World 2 Listen On Different Port Added Var For Making Client Connect To World 2 --- <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-26 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#4756
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?