From 9e0e5c1f9ecb289169321072bbb0275f12aa515b Mon Sep 17 00:00:00 2001 From: skotlex Date: Sun, 26 Mar 2006 05:08:45 +0000 Subject: - Fixed the map-server freeze/crash on Warp Portal. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5751 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/pc.c | 3 +-- src/map/skill.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index bc536d128..b9efa7510 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -6,6 +6,7 @@ GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALAR 2006/03/25 + * Fixed the map-server freeze/crash on Warp Portal. [Skotlex] * Fixed Grandcross/Granddarkness showing no skill animation. [Skotlex] * Fixed mob-casted grandcross doing nothing unless the target was "self" [Skotlex] 2006/03/24 diff --git a/src/map/pc.c b/src/map/pc.c index d76f83337..a812fc8b2 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -154,7 +154,6 @@ int pc_delinvincibletimer(struct map_session_data *sd) { delete_timer(sd->invincible_timer,pc_invincible_timer); sd->invincible_timer = -1; } - skill_unit_move(&sd->bl,gettick(),1); 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)); } - if(sd->mapindex && sd->bl.prev != NULL){ + if(sd->bl.prev != NULL){ unit_remove_map(&sd->bl, 0); if(sd->status.pet_id > 0 && sd->pd) unit_remove_map(&sd->pd->bl, 0); diff --git a/src/map/skill.c b/src/map/skill.c index 0c3ec8c7d..3d8aa3544 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6590,7 +6590,7 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int 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); break; -- cgit v1.2.3-70-g09d2