diff --git a/server/gameserver/trigger.cc b/server/gameserver/trigger.cc index d54b09fa..949d5771 100644 --- a/server/gameserver/trigger.cc +++ b/server/gameserver/trigger.cc @@ -434,6 +434,7 @@ void Trigger::RemoveEventHandler(std::weak_ptr handler) auto p = handler.lock()->data; EventHandler* e = list_entry(&p->entry, EventHandler, entry); e->ptr->data = nullptr; + e->ptr = nullptr; list_del_init(&e->entry); delete e; }