Attempt to fix deleting spells more than once if short durations
This commit is contained in:
parent
053a9abc14
commit
727040d2dd
@ -288,7 +288,8 @@ bool LuaInterface::LoadLuaSpell(const char* name) {
|
|||||||
spell->restored = false;
|
spell->restored = false;
|
||||||
spell->initial_caster_char_id = 0;
|
spell->initial_caster_char_id = 0;
|
||||||
spell->initial_target_char_id = 0;
|
spell->initial_target_char_id = 0;
|
||||||
|
spell->spell_deleting = false;
|
||||||
|
|
||||||
MSpells.lock();
|
MSpells.lock();
|
||||||
if (spells.count(lua_script) > 0) {
|
if (spells.count(lua_script) > 0) {
|
||||||
|
|
||||||
@ -2078,6 +2079,7 @@ LuaSpell* LuaInterface::GetSpell(const char* name) {
|
|||||||
new_spell->restored = false;
|
new_spell->restored = false;
|
||||||
new_spell->initial_caster_char_id = 0;
|
new_spell->initial_caster_char_id = 0;
|
||||||
new_spell->initial_target_char_id = 0;
|
new_spell->initial_target_char_id = 0;
|
||||||
|
new_spell->spell_deleting = false;
|
||||||
return new_spell;
|
return new_spell;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <shared_mutex>
|
#include <shared_mutex>
|
||||||
|
#include <atomic>
|
||||||
|
|
||||||
#include "Spawn.h"
|
#include "Spawn.h"
|
||||||
#include "Spells.h"
|
#include "Spells.h"
|
||||||
@ -102,7 +103,7 @@ struct LuaSpell{
|
|||||||
Mutex MSpellTargets;
|
Mutex MSpellTargets;
|
||||||
int32 effect_bitmask;
|
int32 effect_bitmask;
|
||||||
bool restored; // restored spell cross zone
|
bool restored; // restored spell cross zone
|
||||||
|
std::atomic<bool> spell_deleting;
|
||||||
};
|
};
|
||||||
|
|
||||||
class LUAUserData{
|
class LUAUserData{
|
||||||
|
@ -414,11 +414,12 @@ bool SpellProcess::DeleteCasterSpell(LuaSpell* spell, string reason, bool removi
|
|||||||
if(shared_lock_spell && !removing_all_spells) {
|
if(shared_lock_spell && !removing_all_spells) {
|
||||||
MSpellProcess.lock_shared();
|
MSpellProcess.lock_shared();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
Spawn* target = 0;
|
Spawn* target = 0;
|
||||||
bool target_valid = false;
|
bool target_valid = false;
|
||||||
if(spell) {
|
if(spell && !spell->spell_deleting) {
|
||||||
|
spell->spell_deleting = true;
|
||||||
spell->MSpellTargets.writelock(__FUNCTION__, __LINE__);
|
spell->MSpellTargets.writelock(__FUNCTION__, __LINE__);
|
||||||
if(remove_target && spell->targets.size() > 1) {
|
if(remove_target && spell->targets.size() > 1) {
|
||||||
for (int32 i = 0; i < spell->targets.size(); i++) {
|
for (int32 i = 0; i < spell->targets.size(); i++) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user