mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 06:47:45 +00:00
Code Activity

Merge pull request #91 from amibu01/master

Browse source 
MotDs in array, full player sync after GM commands
This commit is contained in:
SapphireMordred 2017-09-10 17:44:43 +02:00 • committed by GitHub
commit e6b3123462
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/config/settings_zone.xml
View file

@ -18,7 +18,11 @@
</General> </General>
<Parameters> <Parameters>
<!-- Message players see upon logging in --> <!-- Messages players see upon logging in - These *must* be smaller than 307 characters -->
<MotD>&lt;&lt;&lt;Welcome to Sapphire&gt;&gt;&gt;</MotD> <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> </Parameters>
</Settings> </Settings>

6
src/servers/Server_Zone/Actor/PlayerEvent.cpp
View file

@ -234,9 +234,9 @@ void Core::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer )
void Core::Entity::Player::onLogin() void Core::Entity::Player::onLogin()
{ {
; for( auto& child : g_serverZone.getConfig()->getChild( "Settings.Parameters.MotDArray" ) ) {
// TODO: Replace this with MoTD from config sendNotice( child.second.data() );
sendNotice( g_serverZone.getConfig()->getValue< std::string >( "Settings.Parameters.MotD", " <<<Welcome to Sapphire >>>" ) ); }
} }
void Core::Entity::Player::onZoneStart() void Core::Entity::Player::onZoneStart()

7
src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
View file

@ -330,6 +330,9 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
break; break;
} }
pPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
targetPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
} }
void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPacket, 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 ) ); pPlayer->sendUrgent( "GM2 Command not implemented: " + std::to_string( commandId ) );
break; break;
} }
pPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
targetPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
} }