summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-11-07 00:42:36 +0100
committerHaru <haru@dotalux.com>2016-11-07 00:42:36 +0100
commit2c60e01501cdce2fb18eba0fa07f6a350ae96d5e (patch)
tree48678049024332dbe80bc02738f1fa2c92c66781
parent1a623ffce387f82cf8e8d038b9069594459c5440 (diff)
downloadhercules-2c60e01501cdce2fb18eba0fa07f6a350ae96d5e.tar.gz
hercules-2c60e01501cdce2fb18eba0fa07f6a350ae96d5e.tar.bz2
hercules-2c60e01501cdce2fb18eba0fa07f6a350ae96d5e.tar.xz
hercules-2c60e01501cdce2fb18eba0fa07f6a350ae96d5e.zip
Corrected an issue causing WZ_HEAVENDRIVE to be ineffective
The issue was caused by an evident patch mishap in commit 5e04f472e1ef618d9201fd22e382dca829992b3b. The misplaced piece of code has now been moved to the most likely place it was supposed to be in. This commit also removes an extra 'break' introduced by accident in commit f4e8189545642ee0bf87f3da546bddc918682935 (which caused no harm). Related: http://herc.ws/board/topic/13672-heaven-driver/ Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--src/map/skill.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 4c57fbc56..f824c55a7 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -913,6 +913,10 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
break;
#endif
+ case WZ_HEAVENDRIVE:
+ status_change_end(bl, SC_SV_ROOTTWIST, INVALID_TIMER);
+ break;
+
case WZ_STORMGUST:
/**
* Storm Gust counter was dropped in renewal
@@ -9558,7 +9562,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
clif->skill_nodamage(src, bl, skill_id, skill_lv, 1);
sc_start(src, bl, type, 100, skill_lv, skill->get_time(skill_id, skill_lv));
break;
- break;
case SU_BUNCHOFSHRIMP:
if (sd == NULL || sd->status.party_id == 0 || flag&1) {
@@ -12321,9 +12324,6 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6
map->freeblock_unlock();
}
break;
- case WZ_HEAVENDRIVE:
- status_change_end(bl, SC_SV_ROOTTWIST, INVALID_TIMER);
- break;
/**
* The storm gust counter was dropped in renewal
**/