Skip to content

Commit d61b7b9

Browse files
committed
Fixed SpellCast Event trigger
1 parent a659c31 commit d61b7b9

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

ShardSource.lua

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,30 @@ f:SetScript("OnEvent", function(self, event, ...)
6565
elseif event == "COMBAT_LOG_EVENT_UNFILTERED" then
6666
local timestamp, subevent, _, sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags = CombatLogGetCurrentEventInfo()
6767
local fname = strsplit("-", destName)
68+
if(subevent == "UNIT_SPELLCAST_SUCCEEDED") then
69+
DebugLog("Cast Occurred: "..sourceName.." - "..UnitName("player"))
70+
end
6871
if subevent == "UNIT_DIED" and fname == UnitName("target") and targetCanGiveXP then
6972
ctype = strsplit("-", destGUID)
7073
lastShardKill = fname.."_"..ctype.."_"..levelDelta.."_"..targtype.."_"..targlvl
7174
DebugLog("Target died while targeted: " .. lastShardKill)
7275
UpdateShardList()
73-
elseif subevent == "SPELL_CAST_SUCCESS" and sourceName == UnitName("player") then
74-
local timestamp, subevent, _, sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellID, spellName, spellSchool = CombatLogGetCurrentEventInfo()
76+
end
77+
elseif event == "PLAYER_TARGET_CHANGED" then
78+
ChangedTarget()
79+
elseif event == "BANKFRAME_OPENED" then
80+
bankOpen = 1
81+
elseif event == "BANKFRAME_CLOSED" then
82+
bankOpen = 0
83+
elseif event == "CHAT_MSG_ADDON" then
84+
local prefix, msg, dtype, sender = ...
85+
if prefix == Shard_Channel then
86+
GotMessage(msg, sender)
87+
end
88+
elseif event == "UNIT_SPELLCAST_SUCCEEDED" then
89+
local castTarget, castGUID, spellid = ...
90+
local spellName = GetSpellInfo(spellid)
91+
if castTarget == "player" then
7592
if string.find(spellName, "Create Healthstone") then
7693
DebugLog("Healthstone Created")
7794
lastAction = "HStone"
@@ -98,17 +115,6 @@ f:SetScript("OnEvent", function(self, event, ...)
98115
Shards.soulStoneSrc = ""
99116
end
100117
end
101-
elseif event == "PLAYER_TARGET_CHANGED" then
102-
ChangedTarget()
103-
elseif event == "BANKFRAME_OPENED" then
104-
bankOpen = 1
105-
elseif event == "BANKFRAME_CLOSED" then
106-
bankOpen = 0
107-
elseif event == "CHAT_MSG_ADDON" then
108-
local prefix, msg, dtype, sender = ...
109-
if prefix == Shard_Channel then
110-
GotMessage(msg, sender)
111-
end
112118

113119
-- Trading Healthstone
114120
elseif event == "TRADE_SHOW" then
@@ -635,6 +641,7 @@ end
635641
ItemRefTooltip:HookScript("OnTooltipSetItem", SetTooltip)
636642
f:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
637643
f:RegisterEvent("ADDON_LOADED")
644+
f:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED")
638645
f:RegisterEvent("BAG_UPDATE")
639646
f:RegisterEvent("TRADE_SHOW")
640647
f:RegisterEvent("TRADE_ACCEPT_UPDATE")

0 commit comments

Comments
 (0)