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

Fixed persistant emotes

Browse source
This commit is contained in:
Mordred 2021-12-01 01:03:36 +01:00
parent 0f7c27f0a3
commit 2fa9e2c11a
4 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -698,14 +698,16 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
uint8_t LinkFamily; uint8_t LinkFamily;
uint8_t LinkParent; uint8_t LinkParent;
uint8_t PoseEmote; uint8_t PoseEmote;
uint8_t __padding3;
uint16_t Flag;
uint8_t __padding2; uint8_t __padding2;
uint32_t Flag; uint8_t __padding4;
Common::StatusWork Status[30]; Common::StatusWork Status[30];
MountStruct Mount; MountStruct Mount;
uint8_t Name[32]; uint8_t Name[32];
uint8_t Customize[26]; uint8_t Customize[26];
uint8_t __padding3; uint8_t __padding5;
uint8_t __padding4; uint8_t __padding6;
uint32_t Equipment[10]; uint32_t Equipment[10];
float Pos[3]; float Pos[3];
uint8_t FreeCompanyTag[6]; uint8_t FreeCompanyTag[6];

11
src/world/Actor/Player.cpp
View file

@ -998,7 +998,12 @@ void Sapphire::Entity::Player::spawn( Entity::PlayerPtr pTarget )
{ {
Logger::debug( "[{0}] Spawning {1} for {2}", pTarget->getId(), getName(), pTarget->getName() ); Logger::debug( "[{0}] Spawning {1} for {2}", pTarget->getId(), getName(), pTarget->getName() );
pTarget->queuePacket( std::make_shared< PlayerSpawnPacket >( *this, *pTarget ) ); auto spawnPacket = std::make_shared< PlayerSpawnPacket >( *this, *pTarget );
FILE *fp;
fp = fopen( "spawnPacket1.bin", "wb" );
fwrite( spawnPacket->getData().data(), spawnPacket->getData().size(), 1, fp );
fclose( fp );
pTarget->queuePacket( spawnPacket );
} }
// despawn // despawn
@ -1628,10 +1633,6 @@ void Sapphire::Entity::Player::sendZonePackets()
queuePacket( contentFinderList ); queuePacket( contentFinderList );
auto statusPacket = makePlayerSetup( *this ); auto statusPacket = makePlayerSetup( *this );
/*FILE *fp;
fp = fopen( "statusDump.bin", "wb" );
fwrite( statusPacket->getData().data(), statusPacket->getData().size(), 1, fp );
fclose( fp );*/
queuePacket( statusPacket ); queuePacket( statusPacket );

10
src/world/Network/Handlers/PacketHandlers.cpp
View file

@ -432,22 +432,16 @@ void Sapphire::Network::GameConnection::newDiscoveryHandler( const Packets::FFXI
void Sapphire::Network::GameConnection::loginHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, void Sapphire::Network::GameConnection::loginHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player )
Entity::Player& player )
{ {
auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref(); auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref();
// init handler means this is a login procedure // init handler means this is a login procedure
player.setIsLogin( true ); player.setIsLogin( true );
teriMgr.joinWorld( player ); teriMgr.joinWorld( player );
//player.sendZonePackets();
} }
void Sapphire::Network::GameConnection::getBlacklistHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, void Sapphire::Network::GameConnection::getBlacklistHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player )
Entity::Player& player )
{ {
const auto packet = ZoneChannelPacket< Client::FFXIVIpcGetBlacklist >( inPacket ); const auto packet = ZoneChannelPacket< Client::FFXIVIpcGetBlacklist >( inPacket );
auto& data = packet.data(); auto& data = packet.data();

3
src/world/Network/PacketWrappers/PlayerSpawnPacket.h
View file

@ -42,7 +42,8 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
m_data.Lv = player.getLevel(); m_data.Lv = player.getLevel();
m_data.GMRank = player.getGmRank(); m_data.GMRank = player.getGmRank();
m_data.ModeArgs = player.getPose(); m_data.ModeArgs = player.getPersistentEmote();
m_data.PoseEmote = player.getPose();
if( player.isDirectorInitialized() ) if( player.isDirectorInitialized() )
{ {