From 2948d58934843d811280ea9348ea24db8b191679 Mon Sep 17 00:00:00 2001 From: Player Name Date: Sun, 31 Mar 2024 14:14:04 +0000 Subject: [PATCH] Fixed possible softlock at Evil Bob event --- .../main/content/global/ame/events/evilbob/EvilBobDialogue.kt | 2 -- .../content/global/ame/events/evilbob/EvilBobListeners.kt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Server/src/main/content/global/ame/events/evilbob/EvilBobDialogue.kt b/Server/src/main/content/global/ame/events/evilbob/EvilBobDialogue.kt index ce67a8fc4..f8d132a7f 100644 --- a/Server/src/main/content/global/ame/events/evilbob/EvilBobDialogue.kt +++ b/Server/src/main/content/global/ame/events/evilbob/EvilBobDialogue.kt @@ -22,10 +22,8 @@ class EvilBobDialogue(val rewardDialogue: Boolean = false, val rewardXpSkill: In } else if (getAttribute(player!!, EvilBobUtils.eventComplete, false)) { sendDialogue(player!!, "Evil Bob appears to be sleeping, best not to wake him up.").also { stage = END_DIALOGUE } } else if (removeItem(player!!, Items.RAW_FISHLIKE_THING_6200)) { - setAttribute(player!!, EvilBobUtils.fishCaught, false) playerl(FacialExpression.NEUTRAL, "Here, I've brought you some fish.").also { stage = 500 } } else if (removeItem(player!!, Items.RAW_FISHLIKE_THING_6204)) { - setAttribute(player!!, EvilBobUtils.fishCaught, false) setAttribute(player!!, EvilBobUtils.attentive, true) setAttribute(player!!, EvilBobUtils.attentiveNewSpot, true) playerl(FacialExpression.NEUTRAL, "Here, I've brought you some fish.").also { stage = 600 } diff --git a/Server/src/main/content/global/ame/events/evilbob/EvilBobListeners.kt b/Server/src/main/content/global/ame/events/evilbob/EvilBobListeners.kt index 64f2c54fa..fc71ebd68 100644 --- a/Server/src/main/content/global/ame/events/evilbob/EvilBobListeners.kt +++ b/Server/src/main/content/global/ame/events/evilbob/EvilBobListeners.kt @@ -37,7 +37,8 @@ class EvilBobListeners : InteractionListener, MapArea { sendNPCDialogue(player, NPCs.SERVANT_2481, "You'll need a fishing net. There are plenty scattered around the beach.", FacialExpression.SAD) } else if (freeSlots(player) == 0) { sendDialogue(player, "You don't have enough space in your inventory.") - } else if (getAttribute(player, EvilBobUtils.fishCaught, false)) { + } else if (inInventory(player, Items.FISHLIKE_THING_6202) || inInventory(player, Items.FISHLIKE_THING_6206) || + inInventory(player, Items.RAW_FISHLIKE_THING_6200) || inInventory(player, Items.RAW_FISHLIKE_THING_6204)) { sendNPCDialogue(player, NPCs.SERVANT_2481, "You've already got a fish. Come over here to uncook it, then serve it to Evil Bob.", FacialExpression.SAD) } else { lock(player, 6) @@ -68,7 +69,6 @@ class EvilBobListeners : InteractionListener, MapArea { } sendItemDialogue(player, Items.FISHLIKE_THING_6202, "You catch a... what is this?? Is this a fish?? And it's cooked already??") resetAnimator(player) - setAttribute(player, EvilBobUtils.fishCaught, true) } } return@on true