Fixed npcID for AutoAccept.

Shestak · Nov 20, 2014 · d431f26 · d431f26
1 parent ab0ceb6
commit d431f26
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/ShestakUI/Modules/Quests/AutoAccept.lua b/ShestakUI/Modules/Quests/AutoAccept.lua
@@ -56,11 +56,8 @@ local function IsGossipQuestTrivial(index)
 	return not not select(((index * 6) - 6) + 3, GetGossipAvailableQuests())
 end
 
-local function GetCreatureID()
+local function GetNPCID()
-	local type, _, _, _, _, id = string.split(":", UnitGUID("npc") or "")
+	return tonumber(string.match(UnitGUID('npc') or '', 'Creature%-.-%-.-%-.-%-.-%-(.-)%-'))
-	if type == "Creature" and id and tonumber(id) then
-		return tonumber(id)
-	end
 end
 
 Monomyth:Register("GOSSIP_SHOW", function()
@@ -91,8 +88,8 @@ Monomyth:Register("GOSSIP_SHOW", function()
 		end
 	end
 
-	local creatureID = GetCreatureID()
+	local npcID = GetNPCID()
-	if creatureID and creatureID == 57850 then
+	if npcID and npcID == 57850 then
 		SelectGossipOption(1)
 	end
 end)
@@ -104,8 +101,8 @@ local darkmoonNPC = {
 }
 
 Monomyth:Register("GOSSIP_CONFIRM", function(index)
-	local creatureID = GetCreatureID()
+	local npcID = GetNPCID()
-	if creatureID and darkmoonNPC[creatureID] then
+	if npcID and darkmoonNPC[npcID] then
 		SelectGossipOption(index, "", true)
 		StaticPopup_Hide("GOSSIP_CONFIRM")
 	end