From d60644511c84a0b85972f8b19c70e0a5220daca6 Mon Sep 17 00:00:00 2001 From: NixWigton Date: Mon, 9 Aug 2021 18:28:16 -0500 Subject: [PATCH] Changed Bork to use daily reset. --- .../core/game/content/zone/ChaosTunnelZone.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java b/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java index a3d4a3cb5..43f2b83df 100644 --- a/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java +++ b/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java @@ -13,6 +13,8 @@ import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.object.Scenery; +import org.json.simple.JSONObject; +import rs09.ServerStore; import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; @@ -261,13 +263,13 @@ public final class ChaosTunnelZone extends MapZone implements Plugin { * @param player The player. */ private void commenceBorkBattle(Player player) { - if ((System.currentTimeMillis() - player.getSavedData().getActivityData().getLastBorkBattle()) < 24 * 60 * 60_000 && GameWorld.getSettings().isHosted()) { + if (ServerStore.INSTANCE.getBoolean(getStoreFile(), player.getUsername().toLowerCase()) && GameWorld.getSettings().isHosted()) { player.getPacketDispatch().sendMessage("The portal's magic is too weak to teleport you right now."); return; } player.lock(10); player.graphics(Graphics.create(110)); - player.getSavedData().getActivityData().setLastBorkBattle(System.currentTimeMillis()); + getStoreFile().put(player.getUsername().toLowerCase(), true); ActivityManager.start(player, "Bork cutscene", false); } @@ -352,4 +354,12 @@ public final class ChaosTunnelZone extends MapZone implements Plugin { PORTALS.put(location, loc); } + /** + * Returns the Server Store file for Bork being killed for the day + * @return The JSONObject containing the boolean of whether Bork has been killed + */ + private JSONObject getStoreFile() { + return ServerStore.getArchive("daily-bork-killed"); + } + }