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 2023-03-10 18:15:53 +08:00
parent f87e733b56
commit 31360687eb
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/creature.cc
View File

@ -1261,9 +1261,11 @@ void Creature::UpdatePoisoning()
} }
poisoning_time -= 1000; poisoning_time -= 1000;
} }
#if 0
if (need_notify && IsEntitySubType(EST_Player)) { if (need_notify && IsEntitySubType(EST_Player)) {
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);
} }
#endif
} }
void Creature::Shot(glm::vec3& target_dir, bool& shot_ok, float fly_distance, int trace_target_uniid) void Creature::Shot(glm::vec3& target_dir, bool& shot_ok, float fly_distance, int trace_target_uniid)

16
server/gameserver/skill.cc
View File

@ -182,6 +182,14 @@ void Skill::AddMinorMode(
[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) {
} 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(); ResetSkillCd();
if (owner->IsHuman()) { if (owner->IsHuman()) {
Human* hum = owner->AsHuman(); Human* hum = owner->AsHuman();
@ -197,14 +205,6 @@ void Skill::AddMinorMode(
); );
NotifySkillState(); 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); &xtimer_attacher);