[PR #523] [MERGED] Various Changes #590

New Issue

2026-05-15T02:57:55Z

Dark98 commented

2026-05-15 02:57:55 +00:00

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/523
Author: @Dark98
Created: 1/27/2022
Status: ✅ Merged
Merged: 1/27/2022
Merged by: @Dark98

Base: master ← Head: development

📝 Commits (7)

39e7986 Discord Bot Update
6c06807 Update Some Server Libs
dc08a86 Added Purge & Pin/Un-Pin To Commands Discord Bot
5b714cf Fixed -dev & -no-crc Client Args
cd62903 Add Discord User ID Linking Support(Useless For Now)
162eb57 Added Support For User's Kicking Own Accounts Through Discord Bot
64c917c Merge Website Integration Stuff Into One Var

📊 Changes

20 files changed (+237 additions, -86 deletions)

View changed files

📝 2006Scape Client/src/main/java/Main.java (+12 -10)
📝 2006Scape Server/ServerConfig.Sample.json (+1 -1)
📝 2006Scape Server/pom.xml (+16 -16)
📝 2006Scape Server/src/main/java/com/rs2/ConfigLoader.java (+2 -2)
📝 2006Scape Server/src/main/java/com/rs2/GameConstants.java (+2 -1)
📝 2006Scape Server/src/main/java/com/rs2/GameEngine.java (+23 -28)
📝 2006Scape Server/src/main/java/com/rs2/game/players/Player.java (+5 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java (+5 -0)
📝 2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java (+6 -3)
➕ 2006Scape Server/src/main/java/com/rs2/integrations/discord/WelcomeMessage.java (+16 -0)
📝 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java (+6 -4)
📝 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java (+4 -3)
📝 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java (+5 -3)
📝 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Vote.java (+3 -2)
📝 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Website.java (+4 -3)
➕ 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/AdminCommands.java (+31 -0)
📝 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/GameKick.java (+12 -10)
➕ 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/Pin.java (+39 -0)
➕ 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/Purge.java (+40 -0)
📝 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java (+5 -0)

📄 Description

See commits for details

_{🔄 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/523 **Author:** [@Dark98](https://github.com/Dark98) **Created:** 1/27/2022 **Status:** ✅ Merged **Merged:** 1/27/2022 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `development` --- ### 📝 Commits (7) - [`39e7986`](https://github.com/2006-Scape/2006Scape/commit/39e7986d6ef15e1525c84005a6f370b9cc4ff041) Discord Bot Update - [`6c06807`](https://github.com/2006-Scape/2006Scape/commit/6c0680755889eb1b69a36a842de4fed7e17d65dc) Update Some Server Libs - [`dc08a86`](https://github.com/2006-Scape/2006Scape/commit/dc08a864fda48101912e7390ce07efab27eb1be6) Added Purge & Pin/Un-Pin To Commands Discord Bot - [`5b714cf`](https://github.com/2006-Scape/2006Scape/commit/5b714cf4a91f1d12c2d71258fca09f314e6a85b9) Fixed -dev & -no-crc Client Args - [`cd62903`](https://github.com/2006-Scape/2006Scape/commit/cd62903460d52d143990b5d9714848371f21fe26) Add Discord User ID Linking Support(Useless For Now) - [`162eb57`](https://github.com/2006-Scape/2006Scape/commit/162eb577269763d76a8ff742bfcf1a2efd14caed) Added Support For User's Kicking Own Accounts Through Discord Bot - [`64c917c`](https://github.com/2006-Scape/2006Scape/commit/64c917cca78d38cbc26fad8f8a137b2e8fdd53e8) Merge Website Integration Stuff Into One Var ### 📊 Changes **20 files changed** (+237 additions, -86 deletions) <details> <summary>View changed files</summary> 📝 `2006Scape Client/src/main/java/Main.java` (+12 -10) 📝 `2006Scape Server/ServerConfig.Sample.json` (+1 -1) 📝 `2006Scape Server/pom.xml` (+16 -16) 📝 `2006Scape Server/src/main/java/com/rs2/ConfigLoader.java` (+2 -2) 📝 `2006Scape Server/src/main/java/com/rs2/GameConstants.java` (+2 -1) 📝 `2006Scape Server/src/main/java/com/rs2/GameEngine.java` (+23 -28) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/Player.java` (+5 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java` (+5 -0) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java` (+6 -3) ➕ `2006Scape Server/src/main/java/com/rs2/integrations/discord/WelcomeMessage.java` (+16 -0) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java` (+6 -4) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java` (+4 -3) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java` (+5 -3) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Vote.java` (+3 -2) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Website.java` (+4 -3) ➕ `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/AdminCommands.java` (+31 -0) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/GameKick.java` (+12 -10) ➕ `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/Pin.java` (+39 -0) ➕ `2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/Purge.java` (+40 -0) 📝 `2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java` (+5 -0) </details> ### 📄 Description See commits for details --- <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-15 02:57:55 +00:00

Dark98 closed this issue