diff options
| author | Sadie Powell <sadie@witchery.services> | 2021-02-18 23:59:28 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2021-02-18 23:59:28 +0000 |
| commit | c68b81eac87314fb0da83a83fed8679e521cf8eb (patch) | |
| tree | 1200203b739e52f652a9ba1170e4813270780edb /src/nickcore.cpp | |
| parent | 8b2c1548ab46401f96d4e2e0f8258664e21744fb (diff) | |
| parent | 4d271e021042f0b2708abaff5ff3cfb1504a5cc0 (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'src/nickcore.cpp')
| -rw-r--r-- | src/nickcore.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nickcore.cpp b/src/nickcore.cpp index 6b6a00138..cde3e203f 100644 --- a/src/nickcore.cpp +++ b/src/nickcore.cpp @@ -1,6 +1,6 @@ /* * - * (C) 2003-2020 Anope Team + * (C) 2003-2021 Anope Team * Contact us at team@anope.org * * Please read COPYING and README for further details. @@ -74,7 +74,7 @@ NickCore::~NickCore() void NickCore::Serialize(Serialize::Data &data) const { data["display"] << this->display; - data["id"] << this->id; + data["uniqueid"] << this->id; data["pass"] << this->pass; data["email"] << this->email; data["language"] << this->language; @@ -94,7 +94,7 @@ Serializable* NickCore::Unserialize(Serializable *obj, Serialize::Data &data) data["display"] >> sdisplay; uint64_t sid = 0; - data["id"] >> sid; + data["uniqueid"] >> sid; if (obj) nc = anope_dynamic_static_cast<NickCore *>(obj); |