Core: Fixed multiple attempts being added from Pick Pocket

Resolves #722.
WowRarity · Jun 8, 2024 · 582cd6b · 582cd6b
1 parent a6d4251
commit 582cd6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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