From 0c2618e240ccffe642c0ea3a1c0c5eeabbcf637c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 21 Jun 2023 20:09:18 +0800
Subject: [PATCH] 1

---
 server/gameserver/base_agent.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/gameserver/base_agent.cc b/server/gameserver/base_agent.cc
index a194a4f1..2865a37a 100644
--- a/server/gameserver/base_agent.cc
+++ b/server/gameserver/base_agent.cc
@@ -30,7 +30,7 @@ void BtContext::AddHandler(CreatureWeakPtr target, std::weak_ptr<EventHandlerPtr
 BtContext::~BtContext()
 {
     for (auto& tuple : handlers) {
-        if (std::get<0>(tuple).Get()) {
+        if (std::get<0>(tuple).Get() && !std::get<1>(tuple).expired()) {
             std::get<0>(tuple).Get()->GetTrigger()->RemoveEventHandler(std::get<1>(tuple));
         }
     }