From e2a13465b6039d178263832eecff2305f2920f69 Mon Sep 17 00:00:00 2001 From: Jedediah Orne Date: Fri, 20 Oct 2023 06:56:52 +0000 Subject: [PATCH] Fixed wilderness zoning near KBD lever --- .../region/wilderness/handlers/WildernessPlugin.java | 11 ++++------- .../core/game/world/map/zone/impl/WildernessZone.java | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Server/src/main/content/region/wilderness/handlers/WildernessPlugin.java b/Server/src/main/content/region/wilderness/handlers/WildernessPlugin.java index 669666201..40597b85b 100644 --- a/Server/src/main/content/region/wilderness/handlers/WildernessPlugin.java +++ b/Server/src/main/content/region/wilderness/handlers/WildernessPlugin.java @@ -6,6 +6,7 @@ import core.game.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; +import core.game.node.entity.player.link.TeleportManager; import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.scenery.Scenery; import core.game.world.map.Location; @@ -124,13 +125,9 @@ public final class WildernessPlugin extends OptionHandler { if (player.getLocation().withinDistance(LOCATIONS[5])) { animate(player, 2140, false); playAudio(player, Sounds.LEVER_2400); - if (player.isTeleBlocked()) { - player.getPacketDispatch().sendMessage("A magical force has stopped you from teleporting."); - } else { - player.getPacketDispatch().sendMessage("You pull the lever..."); - player.getTeleporter().send(LOCATIONS[4], TeleportType.NORMAL); - player.getPacketDispatch().sendMessage("... and teleport into the lair of the King Black Dragon!", 5); - } + player.getPacketDispatch().sendMessage("You pull the lever..."); + player.getTeleporter().send(LOCATIONS[4], TeleportType.NORMAL, TeleportManager.WILDY_TELEPORT); + player.getPacketDispatch().sendMessage("... and teleport into the lair of the King Black Dragon!", 5); } break; case 1817: diff --git a/Server/src/main/core/game/world/map/zone/impl/WildernessZone.java b/Server/src/main/core/game/world/map/zone/impl/WildernessZone.java index 5277f4409..38252c8d2 100644 --- a/Server/src/main/core/game/world/map/zone/impl/WildernessZone.java +++ b/Server/src/main/core/game/world/map/zone/impl/WildernessZone.java @@ -39,7 +39,7 @@ public final class WildernessZone extends MapZone { /** * The wilderness zone. */ - private static final WildernessZone INSTANCE = new WildernessZone(new ZoneBorders(2944, 3525, 3400, 3975), new ZoneBorders(3070, 9924, 3135, 10002), ZoneBorders.forRegion(12193), ZoneBorders.forRegion(11937)); + private static final WildernessZone INSTANCE = new WildernessZone(new ZoneBorders(2944, 3525, 3400, 3975), new ZoneBorders(3070, 9924, 3135, 10002), ZoneBorders.forRegion(12192), ZoneBorders.forRegion(12193), ZoneBorders.forRegion(11937)); public static final String WILDERNESS_PROT_ATTR = "/save:wilderness-protection-active"; public static final String WILDERNESS_HIGHER_NEXTFEE = "/save:wilderness-higher-next-fee";