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

Merge pull request #108 from Minoost/master

Browse source 
Offset eorzea time
This commit is contained in:
Mordred 2017-09-22 15:40:52 +02:00 • committed by GitHub
commit d4a99fd45a
5 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/servers/Server_Common/Network/PacketDef/Ipcs.h
View file

@ -116,6 +116,7 @@ namespace Packets {
WeatherChange = 0x01AF, // updated for sb WeatherChange = 0x01AF, // updated for sb
Discovery = 0x01B2, // updated for sb Discovery = 0x01B2, // updated for sb
EorzeaTimeOffset = 0x01B4,
CFAvailableContents = 0x01CF, CFAvailableContents = 0x01CF,

5
src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -1281,6 +1281,11 @@ struct FFXIVIpcCFMemberStatus : FFXIVIpcBasePacket<CFMemberStatus>
uint32_t unknown3; uint32_t unknown3;
}; };
struct FFXIVIpcEorzeaTimeOffset : FFXIVIpcBasePacket<EorzeaTimeOffset>
{
uint64_t timestamp;
};
} /* Server */ } /* Server */

11
src/servers/Server_Zone/Actor/Player.cpp
View file

@ -1668,3 +1668,14 @@ void Core::Entity::Player::setOpeningSequence( uint8_t seq )
setSyncFlag( OpeningSeq ); setSyncFlag( OpeningSeq );
m_openingSequence = seq; m_openingSequence = seq;
} }
/// Tells client to offset their eorzean time by given timestamp.
void Core::Entity::Player::setEorzeaTimeOffset( uint64_t timestamp )
{
// TODO: maybe change to persistent?
GamePacketNew< FFXIVIpcEorzeaTimeOffset, ServerZoneIpcType > packet ( getId() );
packet.data().timestamp = timestamp;
// Send to single player
queuePacket( packet );
}

4
src/servers/Server_Zone/Actor/Player.h
View file

@ -499,6 +499,10 @@ public:
uint32_t getCFPenaltyMinutes() const; uint32_t getCFPenaltyMinutes() const;
void setCFPenaltyMinutes( uint32_t minutes ); void setCFPenaltyMinutes( uint32_t minutes );
void setEorzeaTimeOffset( uint64_t timestamp );
private: private:
uint32_t m_lastWrite; uint32_t m_lastWrite;
uint32_t m_lastPing; uint32_t m_lastPing;

12
src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
View file

@ -40,7 +40,6 @@ extern Core::ServerZone g_serverZone;
// instanciate and initialize commands // instanciate and initialize commands
Core::DebugCommandHandler::DebugCommandHandler() Core::DebugCommandHandler::DebugCommandHandler()
{ {
// Push all commands onto the register map ( command name - function - description - required GM level ) // Push all commands onto the register map ( command name - function - description - required GM level )
registerCommand( "set", &DebugCommandHandler::set, "Loads and injects a premade Packet.", 1 ); registerCommand( "set", &DebugCommandHandler::set, "Loads and injects a premade Packet.", 1 );
registerCommand( "get", &DebugCommandHandler::get, "Loads and injects a premade Packet.", 1 ); registerCommand( "get", &DebugCommandHandler::get, "Loads and injects a premade Packet.", 1 );
@ -255,18 +254,25 @@ void Core::DebugCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlaye
else if( subCommand == "aaah" ) else if( subCommand == "aaah" )
{ {
int32_t id; int32_t id;
sscanf( params.c_str(), "%d", &id ); sscanf( params.c_str(), "%d", &id );
pPlayer->sendDebug( std::to_string( pPlayer->actionHasCastTime( id ) ) ); pPlayer->sendDebug( std::to_string( pPlayer->actionHasCastTime( id ) ) );
} }
else if ( subCommand == "cfpenalty" ) else if ( subCommand == "cfpenalty" )
{ {
int32_t minutes; int32_t minutes;
sscanf( params.c_str(), "%d", &minutes ); sscanf( params.c_str(), "%d", &minutes );
pPlayer->setCFPenaltyMinutes( minutes ); pPlayer->setCFPenaltyMinutes( minutes );
} }
else if ( subCommand == "eorzeatime" )
{
uint64_t timestamp;
sscanf( params.c_str(), "%llu", &timestamp );
pPlayer->setEorzeaTimeOffset( timestamp );
pPlayer->sendNotice( "Eorzea time offset: " + std::to_string( timestamp ) );
}
} }