mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 08:27:46 +00:00
Code Activity

Actually send gc information, too

Browse source
This commit is contained in:
Mordred 2018-11-09 21:36:40 +01:00
parent 721b1c745a
commit 61edc8248b
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/CommonGen.h
View file

@ -148,10 +148,9 @@ enum class ExVersion :
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
//GrandCompany.exd //GrandCompany.exd
enum class GrandCompany : enum GrandCompany : uint8_t
uint8_t
{ {
None = 0, NoGc = 0,
Maelstrom = 1, Maelstrom = 1,
OrderoftheTwinAdder = 2, OrderoftheTwinAdder = 2,
ImmortalFlames = 3, ImmortalFlames = 3,
@ -159,8 +158,7 @@ enum class GrandCompany :
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
//GuardianDeity.exd //GuardianDeity.exd
enum class GuardianDeity : enum class GuardianDeity : uint8_t
uint8_t
{ {
HalonetheFury = 1, HalonetheFury = 1,
MenphinatheLover = 2, MenphinatheLover = 2,

9
src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
View file

@ -434,6 +434,15 @@ void Core::Network::GameConnection::finishLoadingHandler( const Core::Network::P
Entity::Player& player ) Entity::Player& player )
{ {
player.sendQuestInfo(); player.sendQuestInfo();
// TODO: load and save this data instead of hardcoding
auto gcPacket = makeZonePacket< FFXIVGCAffiliation >( player.getId() );
gcPacket->data().gcId = player.getGc();
gcPacket->data().gcRank[ 0 ] = player.getGcRankArray()[ 0 ];
gcPacket->data().gcRank[ 1 ] = player.getGcRankArray()[ 1 ];
gcPacket->data().gcRank[ 2 ] = player.getGcRankArray()[ 2 ];
player.queuePacket( gcPacket );
player.getCurrentZone()->onFinishLoading( player ); player.getCurrentZone()->onFinishLoading( player );
// player is done zoning // player is done zoning