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

Fixed a mistake in r12223, where during warping between mapservers, a character's coordinates would get changed before removing the character from the map, producing an infinite loop if the character returned back to the original coordinates. (bugreport:1286)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12442 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-03-27 16:37:31 +00:00
parent b1b356fb11
commit ac90e8170e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/map/pc.c
View File

@ -3586,11 +3586,12 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y
if(!sd->mapindex || map_mapname2ipport(mapindex,&ip,&port)) if(!sd->mapindex || map_mapname2ipport(mapindex,&ip,&port))
return 2; return 2;
//remove from map, THEN change x/y coordinates
unit_remove_map_pc(sd,clrtype);
sd->mapindex = mapindex; sd->mapindex = mapindex;
sd->bl.x=x; sd->bl.x=x;
sd->bl.y=y; sd->bl.y=y;
pc_clean_skilltree(sd); pc_clean_skilltree(sd);
unit_remove_map_pc(sd,clrtype);
chrif_save(sd,2); chrif_save(sd,2);
chrif_changemapserver(sd, ip, (short)port); chrif_changemapserver(sd, ip, (short)port);
//It is important to invoke remove_map separately from unit_free before //It is important to invoke remove_map separately from unit_free before