summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-26 05:08:45 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-26 05:08:45 +0000
commit9e0e5c1f9ecb289169321072bbb0275f12aa515b (patch)
treecadbb22efb60d47163f0e9dd55ceafd0cb096d3f /src/map/pc.c
parent0b27e84e040963c35dbbf1ff1440fbc2b0e5142d (diff)
downloadhercules-9e0e5c1f9ecb289169321072bbb0275f12aa515b.tar.gz
hercules-9e0e5c1f9ecb289169321072bbb0275f12aa515b.tar.bz2
hercules-9e0e5c1f9ecb289169321072bbb0275f12aa515b.tar.xz
hercules-9e0e5c1f9ecb289169321072bbb0275f12aa515b.zip
- 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
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c3
1 files changed, 1 insertions, 2 deletions
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);