From 0bf2d398eae9ae9074ce467239c16d913056c935 Mon Sep 17 00:00:00 2001
From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com>
Date: Thu, 31 Mar 2022 18:17:43 -0700
Subject: [PATCH] moved initialization of entity

---
 dWorldServer/WorldServer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dWorldServer/WorldServer.cpp b/dWorldServer/WorldServer.cpp
index c9b6b00b..c8f2641e 100644
--- a/dWorldServer/WorldServer.cpp
+++ b/dWorldServer/WorldServer.cpp
@@ -1013,15 +1013,15 @@ void HandlePacket(Packet* packet) {
                 Character* c = user->GetLastUsedChar();
                 if (c != nullptr) { 
                     std::u16string username = GeneralUtils::ASCIIToUTF16(c->GetName());
-                    WorldPackets::SendCreateCharacter(packet->systemAddress, c->GetObjectID(), c->GetXMLData(), username, c->GetGMLevel());
-                    WorldPackets::SendServerState(packet->systemAddress);
-
 					Game::server->GetReplicaManager()->AddParticipant(packet->systemAddress);
                     
                     EntityInfo info {};
                     info.lot = 1;
 					Entity* player = EntityManager::Instance()->CreateEntity(info, UserManager::Instance()->GetUser(packet->systemAddress));
 
+                    WorldPackets::SendCreateCharacter(packet->systemAddress, player, c->GetXMLData(), username, c->GetGMLevel());
+                    WorldPackets::SendServerState(packet->systemAddress);
+
 					const auto respawnPoint = player->GetCharacter()->GetRespawnPoint(dZoneManager::Instance()->GetZone()->GetWorldID());
 					
 					EntityManager::Instance()->ConstructEntity(player, UNASSIGNED_SYSTEM_ADDRESS, true);