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

- Fixed the map-server freeze/crash on Warp Portal.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5751 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-03-26 05:08:45 +00:00
parent 6bdbd8646b
commit 43b5fa854d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -6,6 +6,7 @@ GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALAR
2006/03/25 2006/03/25
* Fixed the map-server freeze/crash on Warp Portal. [Skotlex]
* Fixed Grandcross/Granddarkness showing no skill animation. [Skotlex] * Fixed Grandcross/Granddarkness showing no skill animation. [Skotlex]
* Fixed mob-casted grandcross doing nothing unless the target was "self" [Skotlex] * Fixed mob-casted grandcross doing nothing unless the target was "self" [Skotlex]
2006/03/24 2006/03/24

3
src/map/pc.c
View File

@ -154,7 +154,6 @@ int pc_delinvincibletimer(struct map_session_data *sd) {
delete_timer(sd->invincible_timer,pc_invincible_timer); delete_timer(sd->invincible_timer,pc_invincible_timer);
sd->invincible_timer = -1; sd->invincible_timer = -1;
} }
skill_unit_move(&sd->bl,gettick(),1);
return 0; return 0;
} }
@ -3065,7 +3064,7 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
} while(map_getcell(m,x,y,CELL_CHKNOPASS)); } while(map_getcell(m,x,y,CELL_CHKNOPASS));
} }
if(sd->mapindex && sd->bl.prev != NULL){ if(sd->bl.prev != NULL){
unit_remove_map(&sd->bl, 0); unit_remove_map(&sd->bl, 0);
if(sd->status.pet_id > 0 && sd->pd) if(sd->status.pet_id > 0 && sd->pd)
unit_remove_map(&sd->pd->bl, 0); unit_remove_map(&sd->pd->bl, 0);

2
src/map/skill.c
View File

@ -6590,7 +6590,7 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
skill_delunitgroup(sg); skill_delunitgroup(sg);
} }
} }
} else if(battle_config.mob_warpportal) } else if(battle_config.mob_warpportal && bl->type != BL_PET)
unit_warp(bl,map_mapindex2mapid(sg->val3),sg->val2>>16,sg->val2&0xffff,3); unit_warp(bl,map_mapindex2mapid(sg->val3),sg->val2>>16,sg->val2&0xffff,3);
break; break;