From 39abbf73f9100b6347550f80897a8a3b765426a7 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sat, 7 Mar 2020 12:46:25 -0600 Subject: [PATCH] Addressed Issue #111 --- .../skill/member/hunter/bnet/BNetPulse.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Server/src/org/crandor/game/content/skill/member/hunter/bnet/BNetPulse.java b/Server/src/org/crandor/game/content/skill/member/hunter/bnet/BNetPulse.java index 09be37bb1..8b345887f 100644 --- a/Server/src/org/crandor/game/content/skill/member/hunter/bnet/BNetPulse.java +++ b/Server/src/org/crandor/game/content/skill/member/hunter/bnet/BNetPulse.java @@ -12,6 +12,7 @@ import org.crandor.game.world.GameWorld; import org.crandor.game.world.update.flag.context.Animation; import org.crandor.tools.RandomFunction; import org.crandor.tools.StringUtils; +import plugin.activity.puropuro.PuroPuroPlugin; import java.util.Random; @@ -41,6 +42,21 @@ public final class BNetPulse extends SkillPulse { */ private int ticks; + /** + * Update lumbridge impling task, makes sure we're in puro puro and checks diary entry completion + * @returns false if not in puro puro, true and updates diary if in puro puro + */ + public boolean updateLumbridgeImplingTask(Player player) { + if(!player.getZoneMonitor().isInZone("puro puro")){ + return false; + } else { + if(!player.getAchievementDiaryManager().hasCompletedTask(DiaryType.LUMBRIDGE,1,8)){ + player.getAchievementDiaryManager().updateTask(player,DiaryType.LUMBRIDGE,1,8,true); + } + } + return true; + } + /** * Constructs a new {@code BNetPulse} {@code Object}. * @param player the player. @@ -100,8 +116,8 @@ public final class BNetPulse extends SkillPulse { node.finalizeDeath(player); type.reward(player, node); node.setAttribute("dead", GameWorld.getTicks() + 10); - if (type == BNetTypes.ECLECTIC_IMPLING.getNode() && player.getZoneMonitor().isInZone("puro puro") && !player.getAchievementDiaryManager().getDiary(DiaryType.LUMBRIDGE).isComplete(1, 8)) { - player.getAchievementDiaryManager().getDiary(DiaryType.LUMBRIDGE).updateTask(player, 1, 8, true); + if (type == BNetTypes.ECLECTIC_IMPLING.getNode() || type == BNetTypes.ESSENCE_IMPLING.getNode() ) { + updateLumbridgeImplingTask(player); } } else { node.moveStep();