mirror of
https://gitlab.com/2009scape/2009scape.git
synced 2026-08-01 14:39:13 -06:00
Fixed another soft lock in Dwarf Cannon quest
This commit is contained in:
parent
5e6c5bdee1
commit
97f78b9058
3 changed files with 8 additions and 2 deletions
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue