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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show Stats 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) * 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); 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); clif_clearunit_single(sd->npc_id, CLR_OUTSIGHT, sd->fd);
sd->state.using_fake_npc = 0; sd->state.using_fake_npc = 0;
} }
if (sd->st) { if (free_script_stack&&sd->st) {
script_free_state(sd->st); script_free_state(sd->st);
sd->st = NULL; sd->st = NULL;
} }

2
src/map/npc.hpp
View File

@ -1123,7 +1123,7 @@ enum npce_event : uint8 {
}; };
struct view_data* npc_get_viewdata(int class_); struct view_data* npc_get_viewdata(int class_);
int npc_chat_sub(struct block_list* bl, va_list ap); int npc_chat_sub(struct block_list* bl, va_list ap);
int npc_event_dequeue(struct map_session_data* sd); int npc_event_dequeue(struct map_session_data* sd,bool free_script_stack=true);
int npc_event(struct map_session_data* sd, const char* eventname, int ontouch); int npc_event(struct map_session_data* sd, const char* eventname, int ontouch);
int npc_touch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y); int npc_touch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y);
int npc_touch_areanpc2(struct mob_data *md); // [Skotlex] int npc_touch_areanpc2(struct mob_data *md); // [Skotlex]

16
src/map/pc.cpp
View File

@ -5524,12 +5524,19 @@ enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, in
{ {
uint32 ip; uint32 ip;
uint16 port; uint16 port;
struct script_state *st;
//if can't find any map-servers, just abort setting position. //if can't find any map-servers, just abort setting position.
if(!sd->mapindex || map_mapname2ipport(mapindex,&ip,&port)) if(!sd->mapindex || map_mapname2ipport(mapindex,&ip,&port))
return SETPOS_NO_MAPSERVER; return SETPOS_NO_MAPSERVER;
if (sd->npc_id) if (sd->npc_id){
npc_event_dequeue(sd); npc_event_dequeue(sd,false);
st = sd->st;
}else{
st = nullptr;
}
npc_script_event(sd, NPCE_LOGOUT); npc_script_event(sd, NPCE_LOGOUT);
//remove from map, THEN change x/y coordinates //remove from map, THEN change x/y coordinates
unit_remove_map_pc(sd,clrtype); unit_remove_map_pc(sd,clrtype);
@ -5543,6 +5550,11 @@ enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, in
//Free session data from this map server [Kevin] //Free session data from this map server [Kevin]
unit_free_pc(sd); unit_free_pc(sd);
if( st ){
// Has to be done here, because otherwise unit_free_pc will free the stack already
st->state = END;
}
return SETPOS_OK; return SETPOS_OK;
} }