From 8781b3a024abcb1a43798d37dfdae1c7e956060d Mon Sep 17 00:00:00 2001 From: Mordred Date: Tue, 30 Nov 2021 16:27:27 +0100 Subject: [PATCH 1/5] Fixed struct missmatch for emotes --- deps/datReader/Exd/Structs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/deps/datReader/Exd/Structs.h b/deps/datReader/Exd/Structs.h index 878876e5..ac96c764 100644 --- a/deps/datReader/Exd/Structs.h +++ b/deps/datReader/Exd/Structs.h @@ -617,6 +617,7 @@ namespace Component::Excel struct Emote { EmoteTextStruct Text; + uint32_t Unknown; int32_t TimelineID; int32_t TimelineID_Begin; int32_t TimelineID_End; From e845f03ba4d29d12aa0a4e91f2dd972d429ac399 Mon Sep 17 00:00:00 2001 From: Mordred Date: Tue, 30 Nov 2021 16:29:21 +0100 Subject: [PATCH 2/5] Set companion details on spawn --- src/world/Network/PacketWrappers/PlayerSpawnPacket.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h index c539575d..f01bd401 100644 --- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h +++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h @@ -78,8 +78,8 @@ namespace Sapphire::Network::Packets::WorldPackets::Server m_data.Title = player.getTitle(); m_data.Voice = player.getVoiceId(); - //m_data.activeMinion = player.getCurrentCompanion(); - //m_data.activeMinion = 0; + m_data.Companion = player.getCurrentCompanion(); + m_data.Mount.Id = player.getCurrentMount(); m_data.OnlineStatus = static_cast< uint8_t >( player.getOnlineStatus() ); @@ -90,7 +90,7 @@ namespace Sapphire::Network::Packets::WorldPackets::Server m_data.ObjType = 4; if( target.getId() == player.getId() ) { - m_data.Index = 0x00; + m_data.Index = 0; } else { From e672e4a51cf3cc54e3eb9c3e7e5dd5985f45094b Mon Sep 17 00:00:00 2001 From: Mordred Date: Tue, 30 Nov 2021 16:29:57 +0100 Subject: [PATCH 3/5] Unify log prints more --- src/world/Territory/Territory.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp index 4c652573..e021b98c 100644 --- a/src/world/Territory/Territory.cpp +++ b/src/world/Territory/Territory.cpp @@ -508,7 +508,7 @@ void Sapphire::Territory::updateSessions( uint64_t tickCount, bool changedWeathe // this session is not linked to this area anymore, remove it from zone session list if( ( !pPlayer->getCurrentTerritory() ) || ( pPlayer->getCurrentTerritory() != shared_from_this() ) ) { - Logger::debug( "removeActor( pPlayer );" ); + Logger::debug( "[{}] removeActor( pPlayer );", pPlayer->getId() ); removeActor( pPlayer ); return; } @@ -733,12 +733,12 @@ void Sapphire::Territory::updateInRangeSet( Entity::GameObjectPtr pActor, CellPt void Sapphire::Territory::onPlayerZoneIn( Entity::Player& player ) { - Logger::debug( "Territory::onEnterTerritory: Territory#{0}|{1}, Entity#{2}", getGuId(), getTerritoryTypeId(), player.getId() ); + Logger::debug( "[{2}] Territory::onEnterTerritory: Territory#{0}|{1}", getGuId(), getTerritoryTypeId(), player.getId() ); } void Sapphire::Territory::onLeaveTerritory( Entity::Player& player ) { - Logger::debug( "Territory::onLeaveTerritory: Territory#{0}|{1}, Entity#{2}", getGuId(), getTerritoryTypeId(), player.getId() ); + Logger::debug( "[{2}] Territory::onLeaveTerritory: Territory#{0}|{1}", getGuId(), getTerritoryTypeId(), player.getId() ); } void Sapphire::Territory::onUpdate( uint64_t tickCount ) From 0f7c27f0a330e2ebd9a46e047afec94331551938 Mon Sep 17 00:00:00 2001 From: Mordred Date: Wed, 1 Dec 2021 00:05:34 +0100 Subject: [PATCH 4/5] No longer send zone packet twice on initial login --- src/world/Network/Handlers/PacketHandlers.cpp | 7 ++++--- src/world/Network/PacketWrappers/PlayerSpawnPacket.h | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp index c84d56f6..3fde0d16 100644 --- a/src/world/Network/Handlers/PacketHandlers.cpp +++ b/src/world/Network/Handlers/PacketHandlers.cpp @@ -436,12 +436,13 @@ void Sapphire::Network::GameConnection::loginHandler( const Packets::FFXIVARR_PA Entity::Player& player ) { auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref(); - teriMgr.joinWorld( player ); - // init handler means this is a login procedure player.setIsLogin( true ); + teriMgr.joinWorld( player ); - player.sendZonePackets(); + + + //player.sendZonePackets(); } diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h index f01bd401..084eaae4 100644 --- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h +++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h @@ -128,7 +128,6 @@ namespace Sapphire::Network::Packets::WorldPackets::Server } // m_data.currentMount = player.getCurrentMount(); - // m_data.persistentEmote = player.getPersistentEmote(); m_data.MainTarget = player.getTargetId(); //m_data.type = 1; From 2fa9e2c11a6d556ffe7d3638bb91abcebb3f5a8e Mon Sep 17 00:00:00 2001 From: Mordred Date: Wed, 1 Dec 2021 01:03:36 +0100 Subject: [PATCH 5/5] Fixed persistant emotes --- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 8 +++++--- src/world/Actor/Player.cpp | 11 ++++++----- src/world/Network/Handlers/PacketHandlers.cpp | 10 ++-------- src/world/Network/PacketWrappers/PlayerSpawnPacket.h | 3 ++- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index e5603ccd..2f883670 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -698,14 +698,16 @@ namespace Sapphire::Network::Packets::WorldPackets::Server uint8_t LinkFamily; uint8_t LinkParent; uint8_t PoseEmote; + uint8_t __padding3; + uint16_t Flag; uint8_t __padding2; - uint32_t Flag; + uint8_t __padding4; Common::StatusWork Status[30]; MountStruct Mount; uint8_t Name[32]; uint8_t Customize[26]; - uint8_t __padding3; - uint8_t __padding4; + uint8_t __padding5; + uint8_t __padding6; uint32_t Equipment[10]; float Pos[3]; uint8_t FreeCompanyTag[6]; diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index ca7eead9..4ad1e8c3 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -998,7 +998,12 @@ void Sapphire::Entity::Player::spawn( Entity::PlayerPtr pTarget ) { 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 @@ -1628,10 +1633,6 @@ void Sapphire::Entity::Player::sendZonePackets() queuePacket( contentFinderList ); auto statusPacket = makePlayerSetup( *this ); - /*FILE *fp; - fp = fopen( "statusDump.bin", "wb" ); - fwrite( statusPacket->getData().data(), statusPacket->getData().size(), 1, fp ); - fclose( fp );*/ queuePacket( statusPacket ); diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp index 3fde0d16..7193f96f 100644 --- a/src/world/Network/Handlers/PacketHandlers.cpp +++ b/src/world/Network/Handlers/PacketHandlers.cpp @@ -432,22 +432,16 @@ void Sapphire::Network::GameConnection::newDiscoveryHandler( const Packets::FFXI -void Sapphire::Network::GameConnection::loginHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::loginHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref(); // init handler means this is a login procedure player.setIsLogin( true ); teriMgr.joinWorld( player ); - - - - //player.sendZonePackets(); } -void Sapphire::Network::GameConnection::getBlacklistHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::getBlacklistHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcGetBlacklist >( inPacket ); auto& data = packet.data(); diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h index 084eaae4..c208222a 100644 --- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h +++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h @@ -42,7 +42,8 @@ namespace Sapphire::Network::Packets::WorldPackets::Server m_data.Lv = player.getLevel(); m_data.GMRank = player.getGmRank(); - m_data.ModeArgs = player.getPose(); + m_data.ModeArgs = player.getPersistentEmote(); + m_data.PoseEmote = player.getPose(); if( player.isDirectorInitialized() ) {