diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-22 13:13:57 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-22 13:13:57 +0000 |
| commit | 8127768000292c09723018883029ff8a154acc19 (patch) | |
| tree | 4e05695864dbd28dde93f56ec5153123b4895eaa /src | |
| parent | f473fd8efada1697eb9e55cc0523801f2bdd629d (diff) | |
| download | hercules-8127768000292c09723018883029ff8a154acc19.tar.gz hercules-8127768000292c09723018883029ff8a154acc19.tar.bz2 hercules-8127768000292c09723018883029ff8a154acc19.tar.xz hercules-8127768000292c09723018883029ff8a154acc19.zip | |
- Removed hom_setting&02 (ignore skill range) as this was fixed by Gravity some time ago.
- Moved pc_delinvincibletimer from unit_removemap to unit_free as the previous method has a logic glitch that could cause an on-place event to trigger after the on-left event.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12130 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 4 | ||||
| -rw-r--r-- | src/map/unit.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index cd04f4428..437f95253 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3276,10 +3276,6 @@ bool battle_check_range(struct block_list *src,struct block_list *bl,int range) if(src->m != bl->m) // 違うマップ return false; - - if(src->type == BL_HOM && battle_config.hom_setting&0x2) - ; //WTF, way to go Aegis and your awesome bugs. - else if (!check_distance_bl(src, bl, range)) return false; diff --git a/src/map/unit.c b/src/map/unit.c index 287feddad..3ae4aa091 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1640,7 +1640,7 @@ int unit_remove_map(struct block_list *bl, int clrtype) if (bl->type&BL_CHAR) { skill_unit_move(bl,gettick(),4); - skill_cleartimerskill(bl); // タイマースキルクリア + skill_cleartimerskill(bl); } switch( bl->type ) @@ -1673,7 +1673,6 @@ int unit_remove_map(struct block_list *bl, int clrtype) sd->menuskill_id = sd->menuskill_val = 0; sd->npc_shopid = 0; - pc_delinvincibletimer(sd); if(sd->pvp_timer!=-1) { delete_timer(sd->pvp_timer,pc_calc_pvprank_timer); @@ -1763,6 +1762,7 @@ int unit_free(struct block_list *bl, int clrtype) if(status_isdead(bl)) pc_setrestartvalue(sd,2); + pc_delinvincibletimer(sd); //Status that are not saved... if(sd->sc.count) { if(sd->sc.data[SC_SPURT]) |