diff --git a/2006Scape Server/data/cfg/shops.json b/2006Scape Server/data/cfg/shops.json index 72cdb1fa..3f36dec0 100644 --- a/2006Scape Server/data/cfg/shops.json +++ b/2006Scape Server/data/cfg/shops.json @@ -2991,27 +2991,27 @@ "items": [ { "itemId": 1265, - "itemAmount": 10 + "itemAmount": 6 }, { "itemId": 1267, - "itemAmount": 10 + "itemAmount": 5 }, { "itemId": 1269, - "itemAmount": 10 + "itemAmount": 4 }, { "itemId": 1273, - "itemAmount": 10 + "itemAmount": 3 }, { "itemId": 1271, - "itemAmount": 10 + "itemAmount": 2 }, { "itemId": 1275, - "itemAmount": 10 + "itemAmount": 1 } ] }, diff --git a/2006Scape Server/src/main/java/com/rs2/ConfigLoader.kt b/2006Scape Server/src/main/java/com/rs2/ConfigLoader.kt index 743587a3..8131ee1f 100644 --- a/2006Scape Server/src/main/java/com/rs2/ConfigLoader.kt +++ b/2006Scape Server/src/main/java/com/rs2/ConfigLoader.kt @@ -17,12 +17,11 @@ object ConfigLoader { if (obj.has("server_name")) GameConstants.SERVER_NAME = obj.getString("server_name") if (obj.has("server_test_version")) GameConstants.TEST_VERSION = obj.getDouble("server_test_version") if (obj.has("website_link")) GameConstants.WEBSITE_LINK = obj.getString("website_link") - if (obj.has("debug")) GameConstants.SERVER_DEBUG = obj.getBoolean("debug") + if (obj.has("server_debug")) GameConstants.SERVER_DEBUG = obj.getBoolean("server_debug") if (obj.has("file_server")) GameConstants.FILE_SERVER = obj.getBoolean("file_server") if (obj.has("world_id")) GameConstants.WORLD = obj.getInt("world_id") if (obj.has("members_only")) GameConstants.MEMBERS_ONLY = obj.getBoolean("members_only") - if (obj.has("tutorial_island_enabled")) GameConstants.TUTORIAL_ISLAND = - obj.getBoolean("tutorial_island_enabled") + if (obj.has("tutorial_island_enabled")) GameConstants.TUTORIAL_ISLAND = obj.getBoolean("tutorial_island_enabled") if (obj.has("party_room_enabled")) GameConstants.PARTY_ROOM_DISABLED = !obj.getBoolean("party_room_enabled") if (obj.has("clues_enabled")) GameConstants.CLUES_ENABLED = obj.getBoolean("clues_enabled") if (obj.has("admin_can_trade")) GameConstants.ADMIN_CAN_TRADE = obj.getBoolean("admin_can_trade") diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.kt b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.kt index fc2cbc53..6194d715 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.kt +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.kt @@ -12,7 +12,7 @@ class Players : MessageCreateListener { if (PlayerHandler.getPlayerCount() != 1) { event.channel.sendMessage("There are currently " + PlayerHandler.getPlayerCount() + " players online (" + PlayerHandler.getNonPlayerCount() + " staff online).") } else { - event.channel.sendMessage("There is currently " + PlayerHandler.getPlayerCount() + " player online.") + event.channel.sendMessage("There is currently " + PlayerHandler.getPlayerCount() + " player online (" + PlayerHandler.getNonPlayerCount() + " staff online).") } } } 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 2dc75fe2..47a175c9 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 @@ -183,7 +183,7 @@ public class Commands implements PacketType { if (count != 1) { player.getPacketSender().sendMessage("There are currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "players" : "player shops") + " online (" + PlayerHandler.getNonPlayerCount() + " staff member online)."); } else { - player.getPacketSender().sendMessage("There is currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "player" : "player shop") + " online."); + player.getPacketSender().sendMessage("There is currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "player" : "player shop") + " online (\" + PlayerHandler.getNonPlayerCount() + \" staff member online)."); } String[] players = new String[count];