server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-04-10 15:51:08 +08:00
parent 53b6153622
commit 803f0ae873
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server/gameserver/creature.cc
View File

@ -1721,26 +1721,30 @@ 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
( (
dur_time / FRAME_RATE_MS, dur_time / FRAME_RATE_MS,
[this] (int event, const a8::Args* args) [this] (int event, const a8::Args* args)
{ {
if (a8::TIMER_EXEC_EVENT == event) { if (a8::TIMER_EXEC_EVENT == event) {
if (HasBuffEffect(kBET_InGrass) && !dead) { if (HasBuffEffect(kBET_InGrass) && !dead) {
TryAddBuffAndSetTime(this, 8058, 9999999); TryAddBuffAndSetTime(this, 8058, 9999999);
}
} }
} },
}, &xtimer_attacher);
&xtimer_attacher); } else {
} else { TryAddBuffAndSetTime(this, 8058, 9999999);
TryAddBuffAndSetTime(this, 8058, 9999999); }
} }
} }
} }