diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2015-11-10 17:20:23 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2015-11-10 17:20:23 +0100 |
| commit | 903a0075d3c123b16128b9f8f2eb36878c28e282 (patch) | |
| tree | 46e8c60157f98464ae55e7ea5609ffc091422733 /src/users.cpp | |
| parent | 2c51a2bf17b6c377f0207f3d89b4b3f399fc0178 (diff) | |
| parent | aa05a6fd4d5c11dc8e8adc469134a2802446fe9f (diff) | |
Merge branch 'master+alreadysent'
Diffstat (limited to 'src/users.cpp')
| -rw-r--r-- | src/users.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/users.cpp b/src/users.cpp index d503844e7..93fd8d065 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -26,8 +26,6 @@ #include "inspircd.h" #include "xline.h" -already_sent_t LocalUser::already_sent_id = 0; - bool User::IsNoticeMaskSet(unsigned char sm) { if (!isalpha(sm)) @@ -873,7 +871,7 @@ void User::ForEachNeighbor(ForEachNeighborHandler& handler, bool include_self) FOREACH_MOD(OnBuildNeighborList, (this, include_chans, exceptions)); // Get next id, guaranteed to differ from the already_sent field of all users - const already_sent_t newid = ++LocalUser::already_sent_id; + const already_sent_t newid = ServerInstance->Users.NextAlreadySentId(); // Handle exceptions first for (std::map<User*, bool>::const_iterator i = exceptions.begin(); i != exceptions.end(); ++i) |