From 97f78b9058d67e48694a6ca20e7dfc70d2de7344 Mon Sep 17 00:00:00 2001 From: Edie Date: Fri, 3 Jul 2026 09:02:55 +0000 Subject: [PATCH] Fixed another soft lock in Dwarf Cannon quest --- .../content/minigame/barrows/BarrowsActivityPlugin.java | 1 - .../kandarin/quest/dwarfcannon/DwarfCannonPlugin.java | 8 ++++++++ .../region/kandarin/quest/dwarfcannon/NulodionsNotes.kt | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Server/src/main/content/minigame/barrows/BarrowsActivityPlugin.java b/Server/src/main/content/minigame/barrows/BarrowsActivityPlugin.java index fa8df174c..48b95f68f 100644 --- a/Server/src/main/content/minigame/barrows/BarrowsActivityPlugin.java +++ b/Server/src/main/content/minigame/barrows/BarrowsActivityPlugin.java @@ -151,7 +151,6 @@ public final class BarrowsActivityPlugin extends ActivityPlugin { Player player = (Player) e; PacketRepository.send(MinimapState.class, new MinimapStateContext(player, 2)); player.getInterfaceManager().openOverlay(OVERLAY); - setVarp(player, 0, 1); if (getVarp(player, 452) == 0) { shuffleCatacombs(player); } diff --git a/Server/src/main/content/region/kandarin/quest/dwarfcannon/DwarfCannonPlugin.java b/Server/src/main/content/region/kandarin/quest/dwarfcannon/DwarfCannonPlugin.java index 309895c76..876f9cfda 100644 --- a/Server/src/main/content/region/kandarin/quest/dwarfcannon/DwarfCannonPlugin.java +++ b/Server/src/main/content/region/kandarin/quest/dwarfcannon/DwarfCannonPlugin.java @@ -44,6 +44,7 @@ public class DwarfCannonPlugin extends OptionHandler { SceneryDefinition.forId(3).getHandlers().put("option:open", this); SceneryDefinition.forId(5).getHandlers().put("option:inspect", this); SceneryDefinition.forId(2).getHandlers().put("option:enter", this); + SceneryDefinition.forId(11).getHandlers().put("option:climb-up", this); SceneryDefinition.forId(13).getHandlers().put("option:climb-over", this); SceneryDefinition.forId(15601).getHandlers().put("option:inspect", this); for (int i = 15; i < 21; i++) { @@ -110,6 +111,13 @@ public class DwarfCannonPlugin extends OptionHandler { player.animate(Animation.create(845)); player.teleport(new Location(2619, 9797, 0), 2); break; + case 11: + if (node.getLocation().equals(new Location(2570, 3443, 1)) + && quest.getStage(player) == 20 + && !player.hasItem(DwarfCannon.DWARF_REMAINS)) { + setVarp(player, 0, 3, true); + } + return ClimbActionHandler.climbLadder(player, node.asScenery(), option); case 13: ClimbActionHandler.climb(player, new Animation(828), new Location(2623, 3391, 0)); break; diff --git a/Server/src/main/content/region/kandarin/quest/dwarfcannon/NulodionsNotes.kt b/Server/src/main/content/region/kandarin/quest/dwarfcannon/NulodionsNotes.kt index 9d9aea830..9923b7426 100644 --- a/Server/src/main/content/region/kandarin/quest/dwarfcannon/NulodionsNotes.kt +++ b/Server/src/main/content/region/kandarin/quest/dwarfcannon/NulodionsNotes.kt @@ -4,7 +4,6 @@ import content.global.handlers.iface.BookInterface import content.global.handlers.iface.BookLine import content.global.handlers.iface.Page import content.global.handlers.iface.PageSet -import core.api.setAttribute import core.game.interaction.IntType import core.game.interaction.InteractionListener import core.game.node.entity.player.Player