diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nickalias.cpp | 4 | ||||
| -rw-r--r-- | src/nickcore.cpp | 12 | ||||
| -rw-r--r-- | src/regchannel.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/nickalias.cpp b/src/nickalias.cpp index a0adcc378..eae218f1e 100644 --- a/src/nickalias.cpp +++ b/src/nickalias.cpp @@ -139,9 +139,9 @@ NickAlias *NickAlias::Find(const Anope::string &nick) return NULL; } -NickAlias *NickAlias::FindId(uint64_t id) +NickAlias *NickAlias::FindId(uint64_t uid) { - const auto *nc = NickCore::FindId(id); + const auto *nc = NickCore::FindId(uid); return nc ? nc->na : nullptr; } diff --git a/src/nickcore.cpp b/src/nickcore.cpp index 3f79dbf12..8f81382ad 100644 --- a/src/nickcore.cpp +++ b/src/nickcore.cpp @@ -32,8 +32,8 @@ NickCore::NickCore(const Anope::string &coredisplay, uint64_t coreid) Log(LOG_DEBUG) << "Duplicate account " << this->display << " in NickCore table"; // Upgrading users may not have an account identifier. - if (this->id && !NickCoreIdList->insert_or_assign(this->id, this).second) - Log(LOG_DEBUG) << "Duplicate account id " << this->id << " in NickCore table"; + if (this->uniqueid && !NickCoreIdList->insert_or_assign(this->uniqueid, this).second) + Log(LOG_DEBUG) << "Duplicate account id " << this->uniqueid << " in NickCore table"; FOREACH_MOD(OnNickCoreCreate, (this)); } @@ -55,8 +55,8 @@ NickCore::~NickCore() this->users.clear(); NickCoreList->erase(this->display); - if (this->id) - NickCoreIdList->erase(this->id); + if (this->uniqueid) + NickCoreIdList->erase(this->uniqueid); if (!this->memos.memos->empty()) { @@ -244,9 +244,9 @@ NickCore *NickCore::Find(const Anope::string &nick) return NULL; } -NickCore *NickCore::FindId(uint64_t id) +NickCore *NickCore::FindId(uint64_t uid) { - auto it = NickCoreIdList->find(id); + auto it = NickCoreIdList->find(uid); if (it != NickCoreIdList->end()) { it->second->QueueUpdate(); diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 73fb82d7f..dd45bc48e 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -78,7 +78,7 @@ Serializable *AutoKick::Type::Unserialize(Serializable *obj, Serialize::Data &da ak = anope_dynamic_static_cast<AutoKick *>(obj); data["creator"] >> ak->creator; data["reason"] >> ak->reason; - ak->nc = NickCore::Find(snc); + ak->nc = nc; data["mask"] >> ak->mask; data["addtime"] >> ak->addtime; data["last_used"] >> ak->last_used; |