diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-08-28 23:32:31 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-08-28 23:32:31 +0000 |
| commit | c16d2c8445d40e1966b12353054df33e9de6897a (patch) | |
| tree | 7104ea4c3cfd8543d83dd40c950b3aef746d4237 /src/map/skill.c | |
| parent | 9e05523b11ddbe2a03a1c452d53262c0bf8264e1 (diff) | |
| download | hercules-c16d2c8445d40e1966b12353054df33e9de6897a.tar.gz hercules-c16d2c8445d40e1966b12353054df33e9de6897a.tar.bz2 hercules-c16d2c8445d40e1966b12353054df33e9de6897a.tar.xz hercules-c16d2c8445d40e1966b12353054df33e9de6897a.zip | |
*Fixed Blessing crashing the server when used on monsters, monster weapon attack mechanics are currently unknown. * Updated conditions for UNT_EPICLESIS and AB_ADORAMUS (two cases of || to &&.)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14948 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 3ee28ce87..9aac438d4 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8017,7 +8017,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns case UNT_EPICLESIS: sg->val2--; // track when units should be healed. Initial tick heals immediately. - if ( !battle_check_undead(tstatus->race, tstatus->def_ele) || bl->type == BL_PC) + if ( !battle_check_undead(tstatus->race, tstatus->def_ele) && bl->type == BL_PC) { //Effect only players who are not undead element. //Unknown if any status effects should prevent Epiclesis. @@ -8429,7 +8429,7 @@ int skill_check_pc_partner (struct map_session_data *sd, short skill_id, short* memset (p_sd, 0, sizeof(p_sd)); i = map_foreachinrange(skill_check_condition_char_sub, &sd->bl, range, BL_PC, &sd->bl, &c, &p_sd, skill_id); - if (skill_id != PR_BENEDICTIO || skill_id != AB_ADORAMUS) //Apply the average lv to encore skills. + if (skill_id != PR_BENEDICTIO && skill_id != AB_ADORAMUS) //Apply the average lv to encore skills. *skill_lv = (i+(*skill_lv))/(c+1); //I know c should be one, but this shows how it could be used for the average of n partners. return c; } |