From 31360687ebe6356d87dece2cfe408afad033b87d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 10 Mar 2023 18:15:53 +0800 Subject: [PATCH] 1 --- server/gameserver/creature.cc | 2 ++ server/gameserver/skill.cc | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 6b3fecae..4eda4fae 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -1261,9 +1261,11 @@ void Creature::UpdatePoisoning() } poisoning_time -= 1000; } + #if 0 if (need_notify && IsEntitySubType(EST_Player)) { SyncAroundPlayers(__FILE__, __LINE__, __func__); } + #endif } void Creature::Shot(glm::vec3& target_dir, bool& shot_ok, float fly_distance, int trace_target_uniid) diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc index 13581aac..0e45fb99 100644 --- a/server/gameserver/skill.cc +++ b/server/gameserver/skill.cc @@ -182,6 +182,14 @@ void Skill::AddMinorMode( [this] (int event, const a8::Args* args) { if (a8::TIMER_EXEC_EVENT == event) { + } else if (a8::TIMER_DELETE_EVENT == event) { + minor_type_ = SMT_NONE; + minor_cd_time_ = 0; + minor_frameno_ = 0; + if (minor_cb_) { + minor_cb_(0); + } + minor_cb_ = nullptr; ResetSkillCd(); if (owner->IsHuman()) { Human* hum = owner->AsHuman(); @@ -197,14 +205,6 @@ void Skill::AddMinorMode( ); NotifySkillState(); } - } else if (a8::TIMER_DELETE_EVENT == event) { - minor_type_ = SMT_NONE; - minor_cd_time_ = 0; - minor_frameno_ = 0; - if (minor_cb_) { - minor_cb_(0); - } - minor_cb_ = nullptr; } }, &xtimer_attacher);