From c165759fbe0dc1c1632cd5369dd1550f28f45a3b Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Mon, 5 Dec 2016 11:37:08 +0100 Subject: Fix users receiving a QUIT with themselves as source when host cycling in certain cases The OnBuildNeighborList handler in m_auditorium can add the cycling user to the exceptions as an always send exception. To fix, remove the user from the exceptions before processing them. Reported by @genius3000 on IRC --- src/users.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/users.cpp b/src/users.cpp index 418f2c9aa..af0e15f65 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1398,6 +1398,8 @@ void User::DoHostCycle(const std::string &quitline) FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions)); + // Users shouldn't see themselves quitting when host cycling + exceptions.erase(this); for (std::map::iterator i = exceptions.begin(); i != exceptions.end(); ++i) { LocalUser* u = IS_LOCAL(i->first); -- cgit v1.2.3