This time will be different, this time we will succeed!
This commit is contained in:
parent
513fafef3c
commit
0d474d8455
1 changed files with 3 additions and 4 deletions
|
@ -2942,8 +2942,6 @@ void SpellProcess::DeleteSpell(LuaSpell* spell)
|
||||||
{
|
{
|
||||||
RemoveSpellFromQueue(spell->spell, spell->caster);
|
RemoveSpellFromQueue(spell->spell, spell->caster);
|
||||||
|
|
||||||
DeleteActiveSpell(spell);
|
|
||||||
|
|
||||||
if (spell->spell->IsCopiedSpell())
|
if (spell->spell->IsCopiedSpell())
|
||||||
{
|
{
|
||||||
lua_interface->RemoveCustomSpell(spell->spell->GetSpellID());
|
lua_interface->RemoveCustomSpell(spell->spell->GetSpellID());
|
||||||
|
@ -2952,7 +2950,8 @@ void SpellProcess::DeleteSpell(LuaSpell* spell)
|
||||||
|
|
||||||
lua_interface->SetLuaUserDataStale(spell);
|
lua_interface->SetLuaUserDataStale(spell);
|
||||||
lua_interface->RemoveCurrentSpell(spell->state);
|
lua_interface->RemoveCurrentSpell(spell->state);
|
||||||
safe_delete(spell);
|
|
||||||
|
DeleteActiveSpell(spell);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SpellProcess::SpellCannotStack(ZoneServer* zone, Client* client, Entity* caster, LuaSpell* lua_spell, LuaSpell* conflictSpell)
|
void SpellProcess::SpellCannotStack(ZoneServer* zone, Client* client, Entity* caster, LuaSpell* lua_spell, LuaSpell* conflictSpell)
|
||||||
|
@ -2999,7 +2998,7 @@ void SpellProcess::AddSelfAndPetToCharTargets(LuaSpell* spell, Spawn* caster, bo
|
||||||
}
|
}
|
||||||
|
|
||||||
void SpellProcess::DeleteActiveSpell(LuaSpell* spell) {
|
void SpellProcess::DeleteActiveSpell(LuaSpell* spell) {
|
||||||
active_spells.Remove(spell);
|
active_spells.Remove(spell, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SpellProcess::AddLuaSpellTarget(LuaSpell* lua_spell, int32 id, bool lock_spell_targets) {
|
bool SpellProcess::AddLuaSpellTarget(LuaSpell* lua_spell, int32 id, bool lock_spell_targets) {
|
||||||
|
|
Loading…
Reference in a new issue