Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected Electric Shocker versus MVP (#3660)

Browse Source 
* 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!
This commit is contained in:
Aleos 2018-11-29 17:51:00 -05:00 committed by GitHub
parent 9758a38f07
commit a0d1087628
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/skill.cpp
View File

@ -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);

3
src/map/status.cpp
View File

@ -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: