From 8761116b9ba31c0bae2752e379922fddd9fab932 Mon Sep 17 00:00:00 2001 From: Dark98 Date: Fri, 10 Dec 2021 19:32:58 +0000 Subject: [PATCH] Fix XP Rate Multiplier & add ::xprate to cooamnds list if enabled --- 2006Scape Server/src/main/java/com/rs2/GameConstants.java | 2 +- .../src/main/java/com/rs2/game/players/PlayerAssistant.java | 3 ++- .../src/main/java/com/rs2/net/packets/impl/Commands.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/2006Scape Server/src/main/java/com/rs2/GameConstants.java b/2006Scape Server/src/main/java/com/rs2/GameConstants.java index 98b3beb9..fb0ba4a1 100644 --- a/2006Scape Server/src/main/java/com/rs2/GameConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/GameConstants.java @@ -34,7 +34,7 @@ public class GameConstants { public static boolean FILE_SERVER = true, SERVER_DEBUG = false, MEMBERS_ONLY = false, TUTORIAL_ISLAND = false, PARTY_ROOM_DISABLED = false, CLUES_ENABLED = true, ITEM_REQUIREMENTS = true, ADMIN_CAN_TRADE = false, ADMIN_DROP_ITEMS = false, ADMIN_CAN_SELL_ITEMS = false, VARIABLE_XP_RATE = true; - public static double XP_RATE = Player.xpRate; + public static double XP_RATE = 1.0; /** 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 b1436c2d..b3b5a80b 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 @@ -2033,7 +2033,8 @@ public class PlayerAssistant { if (player.tutorialProgress < 36 && player.playerLevel[skill] == 3 && GameConstants.TUTORIAL_ISLAND) { return false; } - amount *= GameConstants.XP_RATE; + + amount *= GameConstants.XP_RATE * player.getXPRate(); int oldLevel = getLevelForXP(player.playerXP[skill]); player.playerXP[skill] += amount; if (oldLevel < getLevelForXP(player.playerXP[skill])) { diff --git a/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java index 5297c45a..e3dcd335 100644 --- a/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java @@ -299,6 +299,7 @@ public class Commands implements PacketType { "", "::snow", "Add some snow in your mainscreen(works only in december)", + (GameConstants.VARIABLE_XP_RATE ? "\\n" + "::xprate\\n" + "Opens dialogue for the player to set/increase their XP rate." : ""), }; // Clear all lines