summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-03 23:52:39 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-03 23:52:39 +0000
commit258b165357167be18f32f6f188b5adc88b75dad5 (patch)
tree984ce70c79a236cfc5e553ac9222647e56aa4c49
parentdbbea5bb4ba3c60db95b7a0ccd98304ede6ab7e0 (diff)
downloadhercules-258b165357167be18f32f6f188b5adc88b75dad5.tar.gz
hercules-258b165357167be18f32f6f188b5adc88b75dad5.tar.bz2
hercules-258b165357167be18f32f6f188b5adc88b75dad5.tar.xz
hercules-258b165357167be18f32f6f188b5adc88b75dad5.zip
- Fixed pc_setpos using unit_remove_map with type 0 instead of 3, which confuses clients and makes them think the character in question is still standing on the spot where it was removed.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5897 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/pc.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 73b55cd2d..137304880 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/03
+ * Fixed pc_setpos using unit_remove_map with type 0 instead of 3, which
+ confuses clients and makes them think the character in question is still
+ standing on the spot where it was removed. This should fix the warp-portal
+ issue. [Skotlex]
* Fixed script command mapwarp. [Skotlex]
* Fixed Auto-counter. [Skotlex]
* Modified Rude-Attacked behaviour so that such skills only triggers when
diff --git a/src/map/pc.c b/src/map/pc.c
index 227b4a9ed..3854fe267 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3054,7 +3054,7 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
if(sd->mapindex){
int ip,port;
if(map_mapname2ipport(mapindex,&ip,&port)==0){
- unit_remove_map(&sd->bl,0);
+ unit_remove_map(&sd->bl,3);
sd->mapindex = mapindex;
sd->bl.x=x;
sd->bl.y=y;
@@ -3093,9 +3093,9 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
}
if(sd->bl.prev != NULL){
- unit_remove_map(&sd->bl, 0);
+ unit_remove_map(&sd->bl, 3);
if(sd->status.pet_id > 0 && sd->pd)
- unit_remove_map(&sd->pd->bl, 0);
+ unit_remove_map(&sd->pd->bl, 3);
clif_changemap(sd,map[m].index,x,y); // [MouseJstr]
}