From 0f7c27f0a330e2ebd9a46e047afec94331551938 Mon Sep 17 00:00:00 2001 From: Mordred Date: Wed, 1 Dec 2021 00:05:34 +0100 Subject: [PATCH] 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;