From ccc0353bad40dfd937e60e3c6cf52d36c91efde9 Mon Sep 17 00:00:00 2001 From: Dark98 Date: Sun, 14 Nov 2021 22:58:29 +0000 Subject: [PATCH] Small Cleanup For World 2 Support Calculate Port For World Based On World Number Use Existing World int For World In Server --- 2006Scape Client/src/main/java/Game.java | 2 +- 2006Scape Server/src/main/java/com/rs2/GameConstants.java | 1 - 2006Scape Server/src/main/java/com/rs2/GameEngine.java | 2 +- .../src/main/java/com/rs2/game/players/PlayerAssistant.java | 4 ++-- 2006Scape Server/src/main/java/com/rs2/net/PacketSender.java | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/2006Scape Client/src/main/java/Game.java b/2006Scape Client/src/main/java/Game.java index 9a99cabf..fdfe3af9 100644 --- a/2006Scape Client/src/main/java/Game.java +++ b/2006Scape Client/src/main/java/Game.java @@ -5927,7 +5927,7 @@ public class Game extends RSApplet { loginMessage2 = "Connecting to server..."; drawLoginScreen(true); } - socketStream = new RSSocket(this, openSocket((ClientSettings.SERVER_WORLD == 1) ? 43594 : 43597 + portOff)); + socketStream = new RSSocket(this, openSocket((ClientSettings.SERVER_WORLD == 1) ? 43594 : 43595 + ClientSettings.SERVER_WORLD + portOff)); long l = TextClass.longForName(s); int i = (int) (l >> 16 & 31L); stream.currentOffset = 0; diff --git a/2006Scape Server/src/main/java/com/rs2/GameConstants.java b/2006Scape Server/src/main/java/com/rs2/GameConstants.java index 002b062e..a505ff1e 100644 --- a/2006Scape Server/src/main/java/com/rs2/GameConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/GameConstants.java @@ -5,7 +5,6 @@ public class GameConstants { public final static boolean SERVER_DEBUG = false; public final static String SERVER_NAME = "2006Scape", SERVER_VERSION = "Server Stage v " + GameConstants.TEST_VERSION + "."; - public final static int SERVER_WORLD = 1; public final static String WEBSITE_LINK = "https://2006Scape.org"; public final static boolean WEBSITE_TOTAL_CHARACTERS_INTEGRATION = false; public final static double TEST_VERSION = 2.3; diff --git a/2006Scape Server/src/main/java/com/rs2/GameEngine.java b/2006Scape Server/src/main/java/com/rs2/GameEngine.java index 5f9c9bef..809c0982 100644 --- a/2006Scape Server/src/main/java/com/rs2/GameEngine.java +++ b/2006Scape Server/src/main/java/com/rs2/GameEngine.java @@ -135,7 +135,7 @@ public class GameEngine { * Port and Cycle rate. */ static { - serverlistenerPort = (GameConstants.SERVER_WORLD == 1) ? 43594 : 43597; + serverlistenerPort = (GameConstants.WORLD == 1) ? 43594 : 43595 + GameConstants.WORLD; shutdownServer = false; } diff --git a/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java index e0bf2959..b1436c2d 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java @@ -95,7 +95,7 @@ public class PlayerAssistant { public void loginScreen() { player.getPacketSender().showInterface(15244); - player.getPacketSender().sendString("Welcome to " + GameConstants.SERVER_NAME + " World: " + GameConstants.SERVER_WORLD + "\\n", 15257); + player.getPacketSender().sendString("Welcome to " + GameConstants.SERVER_NAME + " World: " + GameConstants.WORLD + "\\n", 15257); int currentDay = player.getLastLogin() - player.lastLoginDate; if (player.playerLevel[GameConstants.HERBLORE] < 3) { @@ -1833,7 +1833,7 @@ public class PlayerAssistant { player.getItemAssistant().clearBank(); player.getPlayerAssistant().addStarter(); player.getPlayerAssistant().movePlayer(3233, 3229, 0); - player.getPacketSender().sendMessage("Welcome to @blu@" + GameConstants.SERVER_NAME + " World: " + GameConstants.SERVER_WORLD + "@bla@ - we are currently in Server Stage v@blu@" + GameConstants.TEST_VERSION + "@bla@."); + player.getPacketSender().sendMessage("Welcome to @blu@" + GameConstants.SERVER_NAME + " World: " + GameConstants.WORLD + "@bla@ - we are currently in Server Stage v@blu@" + GameConstants.TEST_VERSION + "@bla@."); player.getPacketSender().sendMessage("@red@Did you know?@bla@ We're open source and pull requests are welcome!"); player.getPacketSender().sendMessage("Source code: github.com/2006-Scape/2006Scape"); player.getPacketSender().sendMessage("Discord: https://discord.gg/hZ6VfWG"); diff --git a/2006Scape Server/src/main/java/com/rs2/net/PacketSender.java b/2006Scape Server/src/main/java/com/rs2/net/PacketSender.java index cc1c3c71..8ef6e169 100644 --- a/2006Scape Server/src/main/java/com/rs2/net/PacketSender.java +++ b/2006Scape Server/src/main/java/com/rs2/net/PacketSender.java @@ -116,7 +116,7 @@ public class PacketSender { if (player.tutorialProgress > 35) { player.getPlayerAssistant().sendSidebars(); Weight.updateWeight(player); - player.getPacketSender().sendMessage("Welcome to @blu@" + GameConstants.SERVER_NAME + " World: " + GameConstants.SERVER_WORLD + "@bla@ - we are currently in Server Stage v@blu@" + GameConstants.TEST_VERSION + "@bla@."); + player.getPacketSender().sendMessage("Welcome to @blu@" + GameConstants.SERVER_NAME + " World: " + GameConstants.WORLD + "@bla@ - we are currently in Server Stage v@blu@" + GameConstants.TEST_VERSION + "@bla@."); player.getPacketSender().sendMessage("@red@Did you know?@bla@ We're open source! Pull requests are welcome"); player.getPacketSender().sendMessage("Source code at github.com/2006-Scape/2006Scape"); player.getPacketSender().sendMessage("Join our Discord: https://discord.gg/hZ6VfWG");