2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-03 00:31:51 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Random Fixes (#554)

Browse Source 
* Shops: Fixed stock amount in "Nurmof's Pickaxe Shop"

* ConfigLoader:Fix server_debug key/value

* Fix "players" Command Text
This commit is contained in:
Josh Shippam
2023-01-28 05:32:52 +00:00
committed by GitHub
parent 6e69dea45a
commit 7f79dff665
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/data/cfg/shops.json
+6 -6
View File
@@ -2991,27 +2991,27 @@
"items": [ "items": [
{ {
"itemId": 1265, "itemId": 1265,
"itemAmount": 10 "itemAmount": 6
}, },
{ {
"itemId": 1267, "itemId": 1267,
"itemAmount": 10 "itemAmount": 5
}, },
{ {
"itemId": 1269, "itemId": 1269,
"itemAmount": 10 "itemAmount": 4
}, },
{ {
"itemId": 1273, "itemId": 1273,
"itemAmount": 10 "itemAmount": 3
}, },
{ {
"itemId": 1271, "itemId": 1271,
"itemAmount": 10 "itemAmount": 2
}, },
{ {
"itemId": 1275, "itemId": 1275,
"itemAmount": 10 "itemAmount": 1
} }
] ]
}, },
2006Scape Server/src/main/java/com/rs2/ConfigLoader.kt
+2 -3
View File
@@ -17,12 +17,11 @@ object ConfigLoader {
if (obj.has("server_name")) GameConstants.SERVER_NAME = obj.getString("server_name") 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("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("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("file_server")) GameConstants.FILE_SERVER = obj.getBoolean("file_server")
if (obj.has("world_id")) GameConstants.WORLD = obj.getInt("world_id") 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("members_only")) GameConstants.MEMBERS_ONLY = obj.getBoolean("members_only")
if (obj.has("tutorial_island_enabled")) GameConstants.TUTORIAL_ISLAND = if (obj.has("tutorial_island_enabled")) GameConstants.TUTORIAL_ISLAND = obj.getBoolean("tutorial_island_enabled")
obj.getBoolean("tutorial_island_enabled")
if (obj.has("party_room_enabled")) GameConstants.PARTY_ROOM_DISABLED = !obj.getBoolean("party_room_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("clues_enabled")) GameConstants.CLUES_ENABLED = obj.getBoolean("clues_enabled")
if (obj.has("admin_can_trade")) GameConstants.ADMIN_CAN_TRADE = obj.getBoolean("admin_can_trade") if (obj.has("admin_can_trade")) GameConstants.ADMIN_CAN_TRADE = obj.getBoolean("admin_can_trade")
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.kt
+1 -1
View File
@@ -12,7 +12,7 @@ class Players : MessageCreateListener {
if (PlayerHandler.getPlayerCount() != 1) { if (PlayerHandler.getPlayerCount() != 1) {
event.channel.sendMessage("There are currently " + PlayerHandler.getPlayerCount() + " players online (" + PlayerHandler.getNonPlayerCount() + " staff online).") event.channel.sendMessage("There are currently " + PlayerHandler.getPlayerCount() + " players online (" + PlayerHandler.getNonPlayerCount() + " staff online).")
} else { } 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).")
} }
} }
} }
2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java
+1 -1
View File
@@ -183,7 +183,7 @@ public class Commands implements PacketType {
if (count != 1) { if (count != 1) {
player.getPacketSender().sendMessage("There are currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "players" : "player shops") + " online (" + PlayerHandler.getNonPlayerCount() + " staff member online)."); player.getPacketSender().sendMessage("There are currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "players" : "player shops") + " online (" + PlayerHandler.getNonPlayerCount() + " staff member online).");
} else { } 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]; String[] players = new String[count];