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

Merge pull request #11 from cannelle/patch-1

Browse Source 
Fix for incorrect mob_warpslave_sub and map_quit clear values.
This commit is contained in:
Cydh Ramdh
2013-09-28 06:30:19 -07:00
parent 659cc57574 2a41ebcf75
commit e52fc947f7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/map.c
View File

@@ -1709,7 +1709,7 @@ int map_quit(struct map_session_data *sd) {
unit_remove_map(&sd->ed->bl,CLR_TELEPORT);
}
unit_remove_map_pc(sd,CLR_TELEPORT);
unit_remove_map_pc(sd,CLR_RESPAWN);
if( map[sd->bl.m].instance_id ) { // Avoid map conflicts and warnings on next login
int16 m;

2
src/map/mob.c
View File

@@ -2815,7 +2815,7 @@ int mob_warpslave_sub(struct block_list *bl,va_list ap)
return 0;
map_search_freecell(master, 0, &x, &y, range, range, 0);
unit_warp(&md->bl, master->m, x, y,CLR_RESPAWN);
unit_warp(&md->bl, master->m, x, y,CLR_TELEPORT);
return 1;
}