summaryrefslogtreecommitdiff
path: root/src/regchannel.cpp
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-08-25 02:59:54 -0400
committerAdam <Adam@anope.org>2013-08-25 04:48:43 -0400
commit847cceaba350444510b37f685d51fdfc584b1fd2 (patch)
treefc43ca0715569f88baa342a6a5b6da27032f2b64 /src/regchannel.cpp
parent09046e3c993cfca2798c11daf294f8c52bb3a785 (diff)
Create persistent channels on startup, which used to work and got lost somewhere
Fix some oddities with using persistent channels with no botserv Send list modes to uplink when bursting Fix issues with persist + keepmodes Fix /os modes clear all not clearing all status modes Fix operwall on ratbox/plexus Dont apply mlock in SetCorrectModes since that just recursively calls itself unncessarially Change command logging to show the command name and not the service name
Diffstat (limited to 'src/regchannel.cpp')
-rw-r--r--src/regchannel.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index 85b1f5b68..c2119453b 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -220,7 +220,6 @@ void ChannelInfo::Serialize(Serialize::Data &data) const
data["last_topic_setter"] << this->last_topic_setter;
data.SetType("last_topic_time", Serialize::Data::DT_INT); data["last_topic_time"] << this->last_topic_time;
data.SetType("bantype", Serialize::Data::DT_INT); data["bantype"] << this->bantype;
- Extensible::ExtensibleSerialize(this, this, data);
{
Anope::string levels_buffer;
for (Anope::map<int16_t>::const_iterator it = this->levels.begin(), it_end = this->levels.end(); it != it_end; ++it)
@@ -233,6 +232,8 @@ void ChannelInfo::Serialize(Serialize::Data &data) const
data["memomax"] << this->memos.memomax;
for (unsigned i = 0; i < this->memos.ignores.size(); ++i)
data["memoignores"] << this->memos.ignores[i] << " ";
+
+ Extensible::ExtensibleSerialize(this, this, data);
}
Serializable* ChannelInfo::Unserialize(Serializable *obj, Serialize::Data &data)
@@ -251,8 +252,6 @@ Serializable* ChannelInfo::Unserialize(Serializable *obj, Serialize::Data &data)
else
ci = new ChannelInfo(sname);
- Extensible::ExtensibleUnserialize(ci, ci, data);
-
ci->SetFounder(NickCore::Find(sfounder));
ci->SetSuccessor(NickCore::Find(ssuccessor));
@@ -288,6 +287,8 @@ Serializable* ChannelInfo::Unserialize(Serializable *obj, Serialize::Data &data)
ci->memos.ignores.push_back(buf);
}
+ Extensible::ExtensibleUnserialize(ci, ci, data);
+
/* compat */
bool b;
b = false;