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 @@
-
- <<<Welcome to Sapphire>>>
+
+
+ <<<Welcome to Sapphire>>>
+ This is a very good server
+ You can change these messages by editing MotDArray in config/settings_zone.xml
+
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", " <<>>" ) );
+ for( auto& child : g_serverZone.getConfig()->getChild( "Settings.Parameters.MotDArray" ) ) {
+ sendNotice( child.second.data() );
+ }
}
void Core::Entity::Player::onZoneStart()
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 );
+
}