summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-04-01 18:58:39 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-04-01 18:58:39 +0000
commiteb9881621f72ae96f0fdabb2680e57db6ac56d22 (patch)
treecee54b71c04450d015a534ddeabe724ff7a05481 /src/map/pc.c
parent6f88f2409f1853ae205573257865462540f935fc (diff)
downloadhercules-eb9881621f72ae96f0fdabb2680e57db6ac56d22.tar.gz
hercules-eb9881621f72ae96f0fdabb2680e57db6ac56d22.tar.bz2
hercules-eb9881621f72ae96f0fdabb2680e57db6ac56d22.tar.xz
hercules-eb9881621f72ae96f0fdabb2680e57db6ac56d22.zip
- Fixed 'OnPCLogoutEvent' being queued and never executed if
the player was already talking to an npc. (bugreport:1209) - Fixed 'OnPCLogoutEvent' not triggering when changing map-servers (pc_setpos). - Combined some isequipped() in item scripts. (bugreport:4158) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14278 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 0df3cda48..91017cf22 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4005,6 +4005,9 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y
if(!sd->mapindex || map_mapname2ipport(mapindex,&ip,&port))
return 2;
+ if (sd->npc_id)
+ npc_event_dequeue(sd);
+ npc_script_event(sd, NPCE_LOGOUT);
//remove from map, THEN change x/y coordinates
unit_remove_map_pc(sd,clrtype);
sd->mapindex = mapindex;