diff --git a/Source/Client/Mode/EntityInit.cpp b/Source/Client/Mode/EntityInit.cpp index fa0ab3e04..854d7fdc4 100644 --- a/Source/Client/Mode/EntityInit.cpp +++ b/Source/Client/Mode/EntityInit.cpp @@ -153,7 +153,10 @@ std::vector CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1 entry->job = static_cast(actor->GetEffectiveJob(-1)); entry->head = *reinterpret_cast(actor->headType); entry->guildId = actor->GetGdid(); - entry->emblemVersion = static_cast(g_guildMgr->GetEmblemVersion(actor->GetGdid())); + { + CGuildMgr* guildMgr = g_guildMgr; + entry->emblemVersion = static_cast(guildMgr->GetEmblemVersion(actor->GetGdid())); + } entry->isPkModeOn = actor->healthState != 0; entry->sex = static_cast(actor->sex); entry->xSize = static_cast(actor->xSize); @@ -192,8 +195,10 @@ std::vector CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1 if (actor->render.state == 3) { entry->state = 1; + } else if (actor->render.state == 6) { + entry->state = 2; } else { - entry->state = actor->render.state == 6 ? 2 : 0; + entry->state = 0; } entry->packetType = packetType; @@ -207,7 +212,10 @@ std::vector CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1 entry->job = static_cast(actor->GetEffectiveJob(-1)); entry->head = *reinterpret_cast(actor->headType); entry->guildId = actor->GetGdid(); - entry->emblemVersion = static_cast(g_guildMgr->GetEmblemVersion(actor->GetGdid())); + { + CGuildMgr* guildMgr = g_guildMgr; + entry->emblemVersion = static_cast(guildMgr->GetEmblemVersion(actor->GetGdid())); + } entry->isPkModeOn = actor->healthState != 0; entry->sex = static_cast(actor->sex); entry->xSize = static_cast(actor->xSize); @@ -215,7 +223,10 @@ std::vector CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1 entry->level = actor->characterLevel; entry->font = static_cast(actor->render.fontSequenceState); entry->bodyPalette = static_cast(actor->render.bodyPalette); - entry->emblemVersion = static_cast(g_guildMgr->GetEmblemVersion(actor->GetGdid())); + { + CGuildMgr* guildMgr = g_guildMgr; + entry->emblemVersion = static_cast(guildMgr->GetEmblemVersion(actor->GetGdid())); + } if (actor->objectType == 0) { CPc* pc = static_cast(actor);