From 582cd6bfc7d052049f3cc993f3fa8a01923dbf89 Mon Sep 17 00:00:00 2001 From: RDW Date: Sat, 8 Jun 2024 21:43:09 +0200 Subject: [PATCH] Core: Fixed multiple attempts being added from Pick Pocket Resolves #722. --- Core.lua | 5 +---- Core/EventHandlers.lua | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Core.lua b/Core.lua index 674118e2..0d4b7547 100644 --- a/Core.lua +++ b/Core.lua @@ -798,10 +798,7 @@ function R:CheckNpcInterest(guid, zone, subzone, zone_t, subzone_t, curSpell, re return end - if not requiresPickpocket then - -- Pick Pocket triggers the same loot events, but it shouldn't prevent kills from counting afterwards - Rarity.guids[guid] = true - end + Rarity.guids[guid] = true -- Increment attempt counter(s). One NPC might drop multiple things we want, so scan for them all. if Rarity.npcs_to_items[npcid] and type(Rarity.npcs_to_items[npcid]) == "table" then diff --git a/Core/EventHandlers.lua b/Core/EventHandlers.lua index 88d1002e..24765610 100644 --- a/Core/EventHandlers.lua +++ b/Core/EventHandlers.lua @@ -2075,6 +2075,11 @@ function R:OnLootReady(event, ...) end end end + + if requiresPickpocket then + -- Pick Pocket triggers the same loot events, but it shouldn't prevent kills from counting afterwards + Rarity.guids[guid] = false + end end end