yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-12-01 21:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change TC DBC spell entry checks to spellinfo checks (see cs_cast.cpp)

Browse Source
This commit is contained in:
Rochet2
2018-01-01 19:42:49 +02:00
parent 92f4783af2
commit 28e2497afa
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
UnitMethods.h
View File

@@ -2330,8 +2330,12 @@ namespace LuaUnit
bool triggered = Eluna::CHECKVAL<bool>(L, 4, false); bool triggered = Eluna::CHECKVAL<bool>(L, 4, false);
#ifdef CMANGOS #ifdef CMANGOS
SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell); SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell);
#else #endif
#ifdef MANGOS
SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell); SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell);
#endif
#ifdef TRINITY
SpellInfo const* spellEntry = sSpellMgr->GetSpellInfo(spell);
#endif #endif
if (!spellEntry) if (!spellEntry)
return 0; return 0;
@@ -2487,38 +2491,42 @@ namespace LuaUnit
*/ */
int AddAura(lua_State* L, Unit* unit) int AddAura(lua_State* L, Unit* unit)
{ {
uint32 spellId = Eluna::CHECKVAL<uint32>(L, 2); uint32 spell = Eluna::CHECKVAL<uint32>(L, 2);
Unit* target = Eluna::CHECKOBJ<Unit>(L, 3); Unit* target = Eluna::CHECKOBJ<Unit>(L, 3);
#ifdef CMANGOS #ifdef CMANGOS
SpellEntry const* spellInfo = GetSpellStore()->LookupEntry<SpellEntry>(spellId); SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell);
#else
SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
#endif #endif
if (!spellInfo) #ifdef MANGOS
SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell);
#endif
#ifdef TRINITY
SpellInfo const* spellEntry = sSpellMgr->GetSpellInfo(spell);
#endif
if (!spellEntry)
return 1; return 1;
#ifndef TRINITY #ifndef TRINITY
if (!IsSpellAppliesAura(spellInfo) && !IsSpellHaveEffect(spellInfo, SPELL_EFFECT_PERSISTENT_AREA_AURA)) if (!IsSpellAppliesAura(spellEntry) && !IsSpellHaveEffect(spellEntry, SPELL_EFFECT_PERSISTENT_AREA_AURA))
return 1; return 1;
SpellAuraHolder* holder = CreateSpellAuraHolder(spellInfo, target, unit); SpellAuraHolder* holder = CreateSpellAuraHolder(spellEntry, target, unit);
for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i) for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
{ {
uint8 eff = spellInfo->Effect[i]; uint8 eff = spellEntry->Effect[i];
if (eff >= TOTAL_SPELL_EFFECTS) if (eff >= TOTAL_SPELL_EFFECTS)
continue; continue;
if (IsAreaAuraEffect(eff) || if (IsAreaAuraEffect(eff) ||
eff == SPELL_EFFECT_APPLY_AURA || eff == SPELL_EFFECT_APPLY_AURA ||
eff == SPELL_EFFECT_PERSISTENT_AREA_AURA) eff == SPELL_EFFECT_PERSISTENT_AREA_AURA)
{ {
Aura* aur = CreateAura(spellInfo, SpellEffIndex(i), NULL, holder, target); Aura* aur = CreateAura(spellEntry, SpellEffIndex(i), NULL, holder, target);
holder->AddAura(aur, SpellEffIndex(i)); holder->AddAura(aur, SpellEffIndex(i));
} }
} }
Eluna::Push(L, target->AddSpellAuraHolder(holder)); Eluna::Push(L, target->AddSpellAuraHolder(holder));
#else #else
Eluna::Push(L, unit->AddAura(spellId, target)); Eluna::Push(L, unit->AddAura(spell, target));
#endif #endif
return 1; return 1;
} }