m_spanningtree Replace direct access of TreeServer::bursting with IsBursting()

6 files changed, 10 insertions, 5 deletions

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index dbf0003bf..1bf847604 100644
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -62,7 +62,7 @@ CmdResult CommandAddLine::Handle(User* usr, std::vector<std::string>& params)
 
 		TreeServer* remoteserver = TreeServer::Get(usr);
 
-		if (!remoteserver->bursting)
+		if (!remoteserver->IsBursting())
 		{
 			ServerInstance->XLines->ApplyLines();
 		}
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index d5b80fcb1..6263237a3 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -203,7 +203,7 @@ void CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeServer* sour
 		}
 	}
 
-	Membership* memb = chan->ForceJoin(who, NULL, sourceserver->bursting);
+	Membership* memb = chan->ForceJoin(who, NULL, sourceserver->IsBursting());
 	if (!memb)
 		return;
 
diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 16d752966..cb55d5c40 100644
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -51,7 +51,7 @@ CmdResult CommandOpertype::HandleRemote(RemoteUser* u, std::vector<std::string>&
 		 * then do nothing. -- w00t
 		 */
 		TreeServer* remoteserver = TreeServer::Get(u);
-		if (remoteserver->bursting || remoteserver->IsSilentULine())
+		if (remoteserver->IsBursting() || remoteserver->IsSilentULine())
 			return CMD_SUCCESS;
 	}
 
diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp
index 6a29163e4..a7dc64f83 100644
--- a/src/modules/m_spanningtree/pong.cpp
+++ b/src/modules/m_spanningtree/pong.cpp
@@ -26,7 +26,7 @@
 
 CmdResult CommandPong::HandleServer(TreeServer* server, std::vector<std::string>& params)
 {
-	if (server->bursting)
+	if (server->IsBursting())
 	{
 		ServerInstance->SNO->WriteGlobalSno('l', "Server \002%s\002 has not finished burst, forcing end of burst (send ENDBURST!)", server->GetName().c_str());
 		server->FinishBurst();
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 6bd1a4f7c..23647bcf3 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -195,6 +195,11 @@ class TreeServer : public Server
 	 */
 	void CheckULine();
 
+	/** Get the bursting state of this server
+	 * @return True if this server is bursting, false if it isn't
+	 */
+	bool IsBursting() const { return bursting; }
+
 	CullResult cull();
 
 	/** Destructor
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 958718202..f7749a1e4 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -129,7 +129,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 
 	bool dosend = true;
 
-	if ((Utils->quiet_bursts && remoteserver->bursting) || _new->server->IsSilentULine())
+	if ((Utils->quiet_bursts && remoteserver->IsBursting()) || _new->server->IsSilentULine())
 		dosend = false;
 
 	if (dosend)