From bd7d8eb276baf305815d51d1fe00ef2216ad0a3f Mon Sep 17 00:00:00 2001 From: Ceikry Date: Mon, 18 Apr 2022 08:12:03 +0000 Subject: [PATCH] Fixed agility interruptible obstacles and repeating low walls --- .../core/game/node/entity/skill/agility/AgilityHandler.java | 2 ++ .../game/node/entity/skill/agility/BarbarianOutpostCourse.kt | 1 + 2 files changed, 3 insertions(+) diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/AgilityHandler.java b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityHandler.java index 0b684e126..6ddb5c655 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/AgilityHandler.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityHandler.java @@ -141,6 +141,7 @@ public final class AgilityHandler { p.setLocation(player.getLocation().transform(0,0,0)); return Unit.INSTANCE; }); + lock(player, ((int) start.getDistance(end)) * 3); ForceMovement movement = new ForceMovement(player, start, end, animation, speed) { @Override public void stop() { @@ -175,6 +176,7 @@ public final class AgilityHandler { p.setLocation(player.getLocation().transform(0,0,0)); return Unit.INSTANCE; }); + lock(player, ((int) start.getDistance(end)) * 3); if (delay < 1) { return forceWalk(player, courseIndex, start, end, animation, speed, experience, message); } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt index 8fb5ab814..e11e2ee9a 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt @@ -60,6 +60,7 @@ class BarbarianOutpostCourse 1948 -> { if (player.location.x > node.location.x) { player.packetDispatch.sendMessage("You cannot climb from this side.") + return true //who missed this return? lol. } val flag = if (node.location == Location(2536, 3553, 0)) 4 else if (node.location == Location(2539, 3553, 0)) 5 else 6 sendMessage(player, "You climb the low wall...")