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-10-31 15:01:16 +08:00
parent 0df5dc6b4c
commit 18fe92b789
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/base_agent.cc
View File

@ -77,7 +77,10 @@ bool BaseAgent::PreEnterCoroutine(int co_id, behaviac::EBTStatus& status)
} }
auto& co = itr->second; auto& co = itr->second;
if (co->status != behaviac::BT_RUNNING) { if (co->status != behaviac::BT_RUNNING) {
#ifdef DEBUG
abort(); abort();
#endif
return true;
} }
co->status = co->runing_cb(co.get()); co->status = co->runing_cb(co.get());
status = co->status; status = co->status;
@ -182,6 +185,9 @@ void BaseAgent::AbortCoroutine(int co_id)
{ {
auto itr = coroutines_hash_.find(co_id); auto itr = coroutines_hash_.find(co_id);
if (itr != coroutines_hash_.end()) { if (itr != coroutines_hash_.end()) {
itr->second->Abort(GetRoom()->GetFrameNo()); if (!itr->second->IsAbort()) {
itr->second->Abort(GetRoom()->GetFrameNo());
itr->second->runing_cb(itr->second.get());
}
} }
} }

2
server/gameserver/hero_agent.cc
View File

@ -522,6 +522,7 @@ behaviac::EBTStatus HeroAgent::CoFindPath(const glm::vec3& pos)
[this, context, pos] (BtCoroutine* co) [this, context, pos] (BtCoroutine* co)
{ {
if (co->IsAbort()) { if (co->IsAbort()) {
owner_->GetMovement()->ClearPath();
return behaviac::BT_FAILURE; return behaviac::BT_FAILURE;
} }
if (owner_->dead) { if (owner_->dead) {
@ -559,6 +560,7 @@ behaviac::EBTStatus HeroAgent::CoFindPathEx(const glm::vec3& pos, float distance
[this, context, distance] (BtCoroutine* co) [this, context, distance] (BtCoroutine* co)
{ {
if (co->IsAbort()) { if (co->IsAbort()) {
owner_->GetMovement()->ClearPath();
return behaviac::BT_FAILURE; return behaviac::BT_FAILURE;
} }
if (owner_->dead) { if (owner_->dead) {