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
master
development
39e7986
6c06807
dc08a86
5b714cf
cd62903
162eb57
64c917c
20 files changed (+237 additions, -86 deletions)
📝 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)
2006Scape Client/src/main/java/Main.java
2006Scape Server/ServerConfig.Sample.json
2006Scape Server/pom.xml
2006Scape Server/src/main/java/com/rs2/ConfigLoader.java
2006Scape Server/src/main/java/com/rs2/GameConstants.java
2006Scape Server/src/main/java/com/rs2/GameEngine.java
2006Scape Server/src/main/java/com/rs2/game/players/Player.java
2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/WelcomeMessage.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Vote.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Website.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/AdminCommands.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/GameKick.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/Pin.java
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/admin/Purge.java
2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java
See commits for details
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 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)
39e7986Discord Bot Update6c06807Update Some Server Libsdc08a86Added Purge & Pin/Un-Pin To Commands Discord Bot5b714cfFixed -dev & -no-crc Client Argscd62903Add Discord User ID Linking Support(Useless For Now)162eb57Added Support For User's Kicking Own Accounts Through Discord Bot64c917cMerge 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.