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

- Fixed slaves warping endlessly to their master when the master-slave distance exceeds 30.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6909 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-06-01 15:03:48 +00:00
parent ee005cf409
commit ff4b163da3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ 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/06/01
* Fixed slaves warping endlessly to their master when the master-slave
distance exceeds 30. [Skotlex]
* SC_ORCISH will now be dispelled on logout (if debufF_on_logout is set)
[Skotlex]
* Removed attackrange/attackrange_ from TBL_PC, corrected clif.c using the

4
src/map/mob.c
View File

@ -893,6 +893,7 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md,unsigned int tick)
if(bl->m != md->bl.m || md->master_dist > 30)
{ // Since it is not in the same map (or is way to far), just warp it
unit_warp(&md->bl,bl->m,bl->x,bl->y,3);
md->master_dist = 0;
return 0;
}
@ -903,11 +904,12 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md,unsigned int tick)
// Since the master was in near immediately before, teleport is carried out and it pursues.
if(old_dist<10 && md->master_dist>18){
unit_warp(&md->bl,-1,bl->x,bl->y,3);
md->master_dist = 0;
return 0;
}
// Approach master if within view range, chase back to Master's area also if standing on top of the master.
if(md->master_dist<md->db->range3 &&
if(md->master_dist<AREA_SIZE &&
(md->master_dist>MOB_SLAVEDISTANCE || md->master_dist == 0) &&
unit_can_move(&md->bl))
{