From f2ab6ec201692bcb8163b5380c12b57ffe161ff9 Mon Sep 17 00:00:00 2001
From: amibu <fakecake@icloud.com>
Date: Sun, 10 Sep 2017 16:15:48 +0200
Subject: [PATCH 1/2] Force full player sync after GM command usage

---
 .../Server_Zone/Network/Handlers/GMCommandHandlers.cpp     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
index d2a063b7..f0e082ca 100644
--- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
@@ -330,6 +330,9 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
             break;
     }
 
+    pPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
+    targetPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
+
 }
 
 void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPacket,
@@ -418,4 +421,8 @@ void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPac
             pPlayer->sendUrgent( "GM2 Command not implemented: " + std::to_string( commandId ) );
             break;
     }
+
+    pPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
+    targetPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
+
 }

From b9f8b06ea786f7c68f812dc9a9ddd43aa94c8e30 Mon Sep 17 00:00:00 2001
From: amibu <fakecake@icloud.com>
Date: Sun, 10 Sep 2017 16:47:40 +0200
Subject: [PATCH 2/2] Put MotDs into a array to send multiple

---
 bin/config/settings_zone.xml                  | 8 ++++++--
 src/servers/Server_Zone/Actor/PlayerEvent.cpp | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bin/config/settings_zone.xml b/bin/config/settings_zone.xml
index a09254e9..2b0a3a4a 100644
--- a/bin/config/settings_zone.xml
+++ b/bin/config/settings_zone.xml
@@ -18,7 +18,11 @@
    </General>
 
    <Parameters>
-	  <!-- Message players see upon logging in -->
-      <MotD>&lt;&lt;&lt;Welcome to Sapphire&gt;&gt;&gt;</MotD>
+	  <!-- Messages players see upon logging in - These *must* be smaller than 307 characters -->
+      <MotDArray>
+         <MotD>&lt;&lt;&lt;Welcome to Sapphire&gt;&gt;&gt;</MotD>
+         <MotD>This is a very good server</MotD>
+         <MotD>You can change these messages by editing MotDArray in config/settings_zone.xml</MotD>
+      </MotdArray>
    </Parameters>
 </Settings>
diff --git a/src/servers/Server_Zone/Actor/PlayerEvent.cpp b/src/servers/Server_Zone/Actor/PlayerEvent.cpp
index 70817511..1240c800 100644
--- a/src/servers/Server_Zone/Actor/PlayerEvent.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerEvent.cpp
@@ -234,9 +234,9 @@ void Core::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer )
 
 void Core::Entity::Player::onLogin()
 {
-   ;
-   // TODO: Replace this with MoTD from config
-   sendNotice( g_serverZone.getConfig()->getValue< std::string >( "Settings.Parameters.MotD", " <<<Welcome to Sapphire >>>" ) );
+   for( auto& child : g_serverZone.getConfig()->getChild( "Settings.Parameters.MotDArray" ) ) {
+      sendNotice( child.second.data() );
+   }
 }
 
 void Core::Entity::Player::onZoneStart()