Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed mapserver crash on script command warp (#2766)

Browse Source 
Fixes #2765

Thanks to @LunarSHINING
This commit is contained in:
Lemongrass3110
2018-01-24 19:30:05 +01:00
committed by GitHub
parent 3a8c8a9da4
commit bb0dd7b8dc
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/npc.cpp
View File

@@ -304,7 +304,7 @@ int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t dat
/*==========================================
* Dequeue event and add timer for execution (100ms)
*------------------------------------------*/
int npc_event_dequeue(struct map_session_data* sd)
int npc_event_dequeue(struct map_session_data* sd,bool free_script_stack)
{
nullpo_ret(sd);
@@ -314,7 +314,7 @@ int npc_event_dequeue(struct map_session_data* sd)
clif_clearunit_single(sd->npc_id, CLR_OUTSIGHT, sd->fd);
sd->state.using_fake_npc = 0;
}
if (sd->st) {
if (free_script_stack&&sd->st) {
script_free_state(sd->st);
sd->st = NULL;
}