This commit is contained in:
aozhiwei 2024-04-10 15:51:08 +08:00
parent 53b6153622
commit 803f0ae873

View File

@ -1721,10 +1721,13 @@ void Creature::CheckSpecObject(int new_poly_flags)
if (a8::HasBitFlag(poly_ext_flags_, i)) { if (a8::HasBitFlag(poly_ext_flags_, i)) {
ClearBuffById(8058); ClearBuffById(8058);
RemoveBuffById(kInGrassBuffId); RemoveBuffById(kInGrassBuffId);
if (!battling_grass_hide_delay_timer.expired()) {
room->xtimer.Delete(battling_grass_hide_delay_timer);
}
} else { } else {
TryAddBuffAndSetTime(this, kInGrassBuffId, 9999999); TryAddBuffAndSetTime(this, kInGrassBuffId, 9999999);
if (battling_grass_hide_delay_timer.expired() && if (battling_grass_hide_delay_timer.expired()) {
(room->GetFrameNo() - last_battling_frameno) * FRAME_RATE_MS < if ((room->GetFrameNo() - last_battling_frameno) * FRAME_RATE_MS <
mt::Param::s().battling_disengage_time) { mt::Param::s().battling_disengage_time) {
int dur_time = mt::Param::s().battling_grass_hide_delay_time; int dur_time = mt::Param::s().battling_grass_hide_delay_time;
battling_grass_hide_delay_timer = room->xtimer.SetTimeoutWpEx battling_grass_hide_delay_timer = room->xtimer.SetTimeoutWpEx
@ -1747,6 +1750,7 @@ void Creature::CheckSpecObject(int new_poly_flags)
} }
} }
} }
}
poly_ext_flags_ = new_poly_flags; poly_ext_flags_ = new_poly_flags;
} }