From a0d108762836c566faf305fcfc968056e1658f83 Mon Sep 17 00:00:00 2001 From: Aleos Date: Thu, 29 Nov 2018 17:51:00 -0500 Subject: [PATCH] Corrected Electric Shocker versus MVP (#3660) * Fixes #3649. * Electric Shocker is able to stop MVP as well. * Status should not stack with itself. * Status should be cleared by normal means. Thanks to @admkakaroto! --- src/map/skill.cpp | 2 -- src/map/status.cpp | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/map/skill.cpp b/src/map/skill.cpp index e6f4d5b588..de0ed93e78 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -13908,8 +13908,6 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, uns case UNT_ELECTRICSHOCKER: if( bl->id != ss->id ) { - if( status_bl_has_mode(bl,MD_STATUS_IMMUNE) ) - break; if( status_change_start(ss, bl,type,10000,sg->skill_lv,sg->group_id,0,0,skill_get_time2(sg->skill_id, sg->skill_lv), SCSTART_NORATEDEF) ) { map_moveblock(bl, unit->bl.x, unit->bl.y, tick); clif_fixpos(bl); diff --git a/src/map/status.cpp b/src/map/status.cpp index d11b52ca63..13d9580c44 100644 --- a/src/map/status.cpp +++ b/src/map/status.cpp @@ -8996,7 +8996,6 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty case SC__UNLUCKY: case SC__WEAKNESS: case SC_BITE: - case SC_ELECTRICSHOCKER: case SC_MAGNETICFIELD: case SC_NETHERWORLD: case SC_CRESCENTELBOW: @@ -9394,6 +9393,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty case SC_OBLIVIONCURSE: case SC_LEECHESEND: case SC_CURSEDCIRCLE_TARGET: + case SC_ELECTRICSHOCKER: case SC_BANDING_DEFENCE: case SC__ENERVATION: case SC__GROOMY: @@ -13907,7 +13907,6 @@ void status_change_clear_buffs(struct block_list* bl, uint8 type) case SC_EXPBOOST: case SC_JEXPBOOST: case SC_ITEMBOOST: - case SC_ELECTRICSHOCKER: case SC__MANHOLE: case SC_GIANTGROWTH: case SC_MILLENNIUMSHIELD: