From 134bf364c8deffa192fb77a323b92b708a2e2276 Mon Sep 17 00:00:00 2001 From: ultramage Date: Wed, 4 Mar 2009 17:26:07 +0000 Subject: Small edits to battleground code (bugreport:2816) - removed bg_idle_announce setting (could be considered later) - moved crystal protection code to battle_calc_bg_damage - removed mob state 'inmunity' in favor of a script-based solution - removed unneeded 'setmobdata' (fixes collision with mob controller) - added svn:eol-style native for battleground code git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13565 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index 159f445ea..54f8495f8 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2983,10 +2983,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in int heal = skill_calc_heal(src, bl, skilllv); int heal_get_jobexp; - if( status_isimmune(bl) ) + if( status_isimmune(bl) || (dstmd && (dstmd->class_ == MOBID_EMPERIUM || mob_is_battleground(dstmd))) ) heal=0; - if( dstmd && (dstmd->class_ == MOBID_EMPERIUM || mob_is_battleground(dstmd)) ) - heal=0; // Emperium - BattleGround Mobs cannot be Healed + if( sd ) { if( (i = pc_skillheal_bonus(sd, skillid)) ) -- cgit v1.2.3-60-g2f50