Move Serialize::Types to construct after the corresponding extensible items they require when unserializing

6 files changed, 15 insertions, 17 deletions

diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp
index aaa4f8d85..fb21f35d7 100644
--- a/modules/commands/cs_entrymsg.cpp
+++ b/modules/commands/cs_entrymsg.cpp
@@ -252,14 +252,13 @@ class CommandEntryMessage : public Command
 class CSEntryMessage : public Module
 {
 	CommandEntryMessage commandentrymsg;
-	Serialize::Type entrymsg_type;
 	ExtensibleItem<EntryMessageList> eml;
+	Serialize::Type entrymsg_type;
 
  public:
 	CSEntryMessage(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 	commandentrymsg(this),
-	entrymsg_type("EntryMsg", EntryMsg::Unserialize),
-	eml(this, "entrymsg")
+	eml(this, "entrymsg"), entrymsg_type("EntryMsg", EntryMsg::Unserialize)
 	{
 	}
 
diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp
index d93dcf8a2..b74b67466 100644
--- a/modules/commands/cs_log.cpp
+++ b/modules/commands/cs_log.cpp
@@ -277,8 +277,8 @@ class CSLog : public Module
 {
 	ServiceReference<MemoServService> MSService;
 	CommandCSLog commandcslog;
-	Serialize::Type logsetting_type;
 	ExtensibleItem<LogSettingsImpl> logsettings;
+	Serialize::Type logsetting_type;
 
 	struct LogDefault
 	{
@@ -290,8 +290,7 @@ class CSLog : public Module
  public:
 	CSLog(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		MSService("MemoServService", "MemoServ"), commandcslog(this),
-		logsetting_type("LogSetting", LogSettingImpl::Unserialize),
-		logsettings(this, "logsettings")
+		logsettings(this, "logsettings"), logsetting_type("LogSetting", LogSettingImpl::Unserialize)
 	{
 
 	}
diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index 0974f18c2..856b43870 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -828,14 +828,14 @@ class CSMode : public Module
 {
 	CommandCSMode commandcsmode;
 	CommandCSModes commandcsmodes;
-	Serialize::Type modelocks_type;
 	ExtensibleItem<ModeLocksImpl> modelocks;
+	Serialize::Type modelocks_type;
 
  public:
 	CSMode(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsmode(this), commandcsmodes(this),
-		modelocks_type("ModeLock", ModeLockImpl::Unserialize),
-		modelocks(this, "modelocks")
+		modelocks(this, "modelocks"),
+		modelocks_type("ModeLock", ModeLockImpl::Unserialize)
 	{
 
 	}
diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp
index 5203b086b..e7d39f589 100644
--- a/modules/commands/hs_request.cpp
+++ b/modules/commands/hs_request.cpp
@@ -328,17 +328,17 @@ class CommandHSWaiting : public Command
 
 class HSRequest : public Module
 {
-	Serialize::Type request_type;
 	CommandHSRequest commandhsrequest;
 	CommandHSActivate commandhsactive;
 	CommandHSReject commandhsreject;
 	CommandHSWaiting commandhswaiting;
 	ExtensibleItem<HostRequest> hostrequest;
+	Serialize::Type request_type;
 
  public:
 	HSRequest(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
-		request_type("HostRequest", HostRequest::Unserialize), commandhsrequest(this), commandhsactive(this),
-		commandhsreject(this), commandhswaiting(this), hostrequest(this, "hostrequest")
+		commandhsrequest(this), commandhsactive(this),
+		commandhsreject(this), commandhswaiting(this), hostrequest(this, "hostrequest"), request_type("HostRequest", HostRequest::Unserialize)
 	{
 
 		if (!IRCD || !IRCD->CanSetVHost)
diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp
index 4409afa2b..6566dded6 100644
--- a/modules/commands/ns_ajoin.cpp
+++ b/modules/commands/ns_ajoin.cpp
@@ -225,13 +225,13 @@ class CommandNSAJoin : public Command
 class NSAJoin : public Module
 {
 	CommandNSAJoin commandnsajoin;
-	Serialize::Type ajoinentry_type;
 	ExtensibleItem<AJoinList> ajoinlist;
+	Serialize::Type ajoinentry_type;
 
  public:
 	NSAJoin(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
-		commandnsajoin(this),
-		ajoinentry_type("AJoinEntry", AJoinEntry::Unserialize), ajoinlist(this, "ajoinlist")
+		commandnsajoin(this), ajoinlist(this, "ajoinlist"),
+		ajoinentry_type("AJoinEntry", AJoinEntry::Unserialize)
 	{
 
 		if (!IRCD->CanSVSJoin)
diff --git a/modules/commands/os_info.cpp b/modules/commands/os_info.cpp
index b3da203c0..f5239abb4 100644
--- a/modules/commands/os_info.cpp
+++ b/modules/commands/os_info.cpp
@@ -241,8 +241,8 @@ class CommandOSInfo : public Command
 class OSInfo : public Module
 {
 	CommandOSInfo commandosinfo;
-	Serialize::Type oinfo_type;
 	ExtensibleItem<OperInfos> oinfo;
+	Serialize::Type oinfo_type;
 
 	void OnInfo(CommandSource &source, Extensible *e, InfoFormatter &info)
 	{
@@ -262,7 +262,7 @@ class OSInfo : public Module
 
  public:
 	OSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
-		commandosinfo(this), oinfo_type("OperInfo", OperInfo::Unserialize), oinfo(this, "operinfo")
+		commandosinfo(this), oinfo(this, "operinfo"), oinfo_type("OperInfo", OperInfo::Unserialize)
 	{
 
 	}