Unverified Commit 4171cd18 authored by Aleos's avatar Aleos Committed by GitHub

Updates Rolling Cutter counter behavior (#2837)

* Fixes #2835.
* Rolling Cutter counter should only be reset on physical click-walks, not by any other movement.
Thanks to @ecdarreola and @secretdataz!
parent c5789f1e
......@@ -10750,6 +10750,7 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
// not when you move each cell. This is official behaviour.
if (sd->sc.data[SC_CLOAKING])
skill_check_cloaking(&sd->bl, sd->sc.data[SC_CLOAKING]);
status_change_end(&sd->bl, SC_ROLLINGCUTTER, INVALID_TIMER); // If you move, you lose your counters. [malufett]
pc_delinvincibletimer(sd);
......
......@@ -415,7 +415,6 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick)
skill_unit_move(bl,tick,2);
if ( sc && sc->count ) //at least one to cancel
{
status_change_end(bl, SC_ROLLINGCUTTER, INVALID_TIMER); // If you move, you lose your counters. [malufett]
status_change_end(bl, SC_CLOSECONFINE, INVALID_TIMER);
status_change_end(bl, SC_CLOSECONFINE2, INVALID_TIMER);
status_change_end(bl, SC_TINDER_BREAKER, INVALID_TIMER);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment