Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

revert and check if "remove" function exists in script

Browse Source
This commit is contained in:
Emagi 2024-09-02 09:19:47 -04:00
parent 727040d2dd
commit 950b8e1564
3 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/WorldServer/LuaInterface.cpp
View File

@ -288,7 +288,6 @@ 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) {
@ -854,6 +853,11 @@ lua_State* LuaInterface::LoadLuaFile(const char* name) {
void LuaInterface::RemoveSpell(LuaSpell* spell, bool call_remove_function, bool can_delete, string reason, bool removing_all_spells) { void LuaInterface::RemoveSpell(LuaSpell* spell, bool call_remove_function, bool can_delete, string reason, bool removing_all_spells) {
if(call_remove_function){ if(call_remove_function){
lua_getglobal(spell->state, "remove");
if (!lua_isfunction(spell->state, lua_gettop(spell->state))){
lua_pop(spell->state, 1);
}
else {
lua_getglobal(spell->state, "remove"); lua_getglobal(spell->state, "remove");
LUASpawnWrapper* spawn_wrapper = new LUASpawnWrapper(); LUASpawnWrapper* spawn_wrapper = new LUASpawnWrapper();
spawn_wrapper->spawn = spell->caster; spawn_wrapper->spawn = spell->caster;
@ -883,9 +887,11 @@ void LuaInterface::RemoveSpell(LuaSpell* spell, bool call_remove_function, bool
MSpells.lock(); MSpells.lock();
current_spells[spell->state] = spell; current_spells[spell->state] = spell;
MSpells.unlock(); MSpells.unlock();
lua_pcall(spell->state, 3, 0, 0); lua_pcall(spell->state, 3, 0, 0);
ResetFunctionStack(spell->state); ResetFunctionStack(spell->state);
} }
}
spell->MSpellTargets.readlock(__FUNCTION__, __LINE__); spell->MSpellTargets.readlock(__FUNCTION__, __LINE__);
if(spell->caster) { if(spell->caster) {
@ -2079,7 +2085,6 @@ 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{

3
source/WorldServer/LuaInterface.h
View File

@ -22,7 +22,6 @@
#include <mutex> #include <mutex>
#include <shared_mutex> #include <shared_mutex>
#include <atomic>
#include "Spawn.h" #include "Spawn.h"
#include "Spells.h" #include "Spells.h"
@ -103,7 +102,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{

3
source/WorldServer/SpellProcess.cpp
View File

@ -418,8 +418,7 @@ bool SpellProcess::DeleteCasterSpell(LuaSpell* spell, string reason, bool removi
bool ret = false; bool ret = false;
Spawn* target = 0; Spawn* target = 0;
bool target_valid = false; bool target_valid = false;
if(spell && !spell->spell_deleting) { if(spell) {
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++) {