From 1a0fb8f82132b6bd52fda2c74b7de2d40fa5fe2f Mon Sep 17 00:00:00 2001 From: aleos89 Date: Thu, 7 Jul 2016 20:13:25 -0400 Subject: [PATCH] Updated Golden Thief Bug card immunity (fixes #1400) * White Imprison and Hell's Plant are now blocked by Golden Thief Bug card. * Removed an extra status end of White Imprison in Status Recovery. --- src/map/skill.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/map/skill.c b/src/map/skill.c index ff40e02ef6..20c446dd2c 100755 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7193,7 +7193,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui status_change_end(bl, SC_STUN, INVALID_TIMER); status_change_end(bl, SC_WHITEIMPRISON, INVALID_TIMER); status_change_end(bl, SC_NETHERWORLD, INVALID_TIMER); - status_change_end(bl, SC_WHITEIMPRISON, INVALID_TIMER); } status_change_end(bl, SC_STASIS, INVALID_TIMER); if(battle_check_undead(tstatus->race,tstatus->def_ele)) @@ -9256,7 +9255,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui break; case WL_WHITEIMPRISON: - if( (src == bl || battle_check_target(src, bl, BCT_ENEMY)>0) && status_get_class_(bl) != CLASS_BOSS ) // Should not work with Bosses. + if( (src == bl || battle_check_target(src, bl, BCT_ENEMY)>0) && status_get_class_(bl) != CLASS_BOSS && !status_isimmune(bl) ) // Should not work with Bosses. { int rate = ( sd? sd->status.job_level : 50 ) / 4; @@ -13932,7 +13931,7 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, uns break; case UNT_HELLS_PLANT: - if (tsc && tsc->data[SC__MANHOLE]) + if ((tsc && tsc->data[SC__MANHOLE]) || status_isimmune(bl)) break; if( battle_check_target(&unit->bl,bl,BCT_ENEMY) > 0 ) skill_attack(skill_get_type(GN_HELLS_PLANT_ATK), ss, &unit->bl, bl, GN_HELLS_PLANT_ATK, sg->skill_lv, tick, SCSTART_NONE);