pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-08 14:12:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update entity.cpp

Browse Source
This commit is contained in:
Akkadius 2024-11-15 15:49:31 -06:00
parent abc507d173
commit 2bf02a5be5
1 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zone/entity.cpp
View File

@ -697,6 +697,7 @@ void EntityList::AddNPC(NPC *npc, bool send_spawn_packet, bool dont_queue)
mob_list.emplace(std::pair<uint16, Mob *>(npc->GetID(), npc)); mob_list.emplace(std::pair<uint16, Mob *>(npc->GetID(), npc));
entity_list.ScanCloseMobs(npc); entity_list.ScanCloseMobs(npc);
entity_list.UpdateVisibility(npc);
if (parse->HasQuestSub(npc->GetNPCTypeID(), EVENT_SPAWN)) { if (parse->HasQuestSub(npc->GetNPCTypeID(), EVENT_SPAWN)) {
parse->EventNPC(EVENT_SPAWN, npc, nullptr, "", 0); parse->EventNPC(EVENT_SPAWN, npc, nullptr, "", 0);
@ -2978,7 +2979,7 @@ BenchTimer g_vis_bench_timer;
void EntityList::UpdateVisibility(Mob *scanning_mob) void EntityList::UpdateVisibility(Mob *scanning_mob)
{ {
if (!scanning_mob || !scanning_mob->IsClient()) { if (!scanning_mob) {
return; return;
} }
@ -3002,7 +3003,8 @@ void EntityList::UpdateVisibility(Mob *scanning_mob)
auto [it_scanning_visible, inserted_scanning_visible] = scanning_mob->m_can_see_mob.try_emplace(mob_id, false); auto [it_scanning_visible, inserted_scanning_visible] = scanning_mob->m_can_see_mob.try_emplace(mob_id, false);
bool scanning_last_known_visible = it_scanning_visible->second; bool scanning_last_known_visible = it_scanning_visible->second;
if (!scanning_last_known_visible && mob->IsClient()) { if (!scanning_last_known_visible) {
if (mob->IsClient()) {
scanning_mob->SendAppearancePacket( scanning_mob->SendAppearancePacket(
AppearanceType::Invisibility, AppearanceType::Invisibility,
0, 0,
@ -3010,6 +3012,8 @@ void EntityList::UpdateVisibility(Mob *scanning_mob)
true, true,
mob->CastToClient() mob->CastToClient()
); );
}
it_scanning_visible->second = true; it_scanning_visible->second = true;
LogVisibilityDetail("Setting scanning_mob [{}] visible to mob [{}]", scanning_mob->GetCleanName(), mob->GetCleanName()); LogVisibilityDetail("Setting scanning_mob [{}] visible to mob [{}]", scanning_mob->GetCleanName(), mob->GetCleanName());
} }
@ -3018,7 +3022,8 @@ void EntityList::UpdateVisibility(Mob *scanning_mob)
auto [it_mob_visible, inserted_mob_visible] = mob->m_can_see_mob.try_emplace(scanning_mob->GetID(), false); auto [it_mob_visible, inserted_mob_visible] = mob->m_can_see_mob.try_emplace(scanning_mob->GetID(), false);
bool mob_last_known_visible = it_mob_visible->second; bool mob_last_known_visible = it_mob_visible->second;
if (!mob_last_known_visible && scanning_mob->IsClient()) { if (!mob_last_known_visible) {
if (scanning_mob->IsClient()) {
mob->SendAppearancePacket( mob->SendAppearancePacket(
AppearanceType::Invisibility, AppearanceType::Invisibility,
0, 0,
@ -3026,6 +3031,8 @@ void EntityList::UpdateVisibility(Mob *scanning_mob)
true, true,
scanning_mob->CastToClient() scanning_mob->CastToClient()
); );
}
it_mob_visible->second = true; it_mob_visible->second = true;
LogVisibilityDetail("Setting mob [{}] visible to scanning_mob [{}]", mob->GetCleanName(), scanning_mob->GetCleanName()); LogVisibilityDetail("Setting mob [{}] visible to scanning_mob [{}]", mob->GetCleanName(), scanning_mob->GetCleanName());
} }
@ -3043,7 +3050,8 @@ void EntityList::UpdateVisibility(Mob *scanning_mob)
auto [it, inserted] = scanning_mob->m_can_see_mob.try_emplace(mob_id, false); auto [it, inserted] = scanning_mob->m_can_see_mob.try_emplace(mob_id, false);
bool last_known_visible = it->second; bool last_known_visible = it->second;
if (!is_on_close_list && last_known_visible && mob->IsClient()) { if (!is_on_close_list && last_known_visible) {
if (mob->IsClient()) {
scanning_mob->SendAppearancePacket( scanning_mob->SendAppearancePacket(
AppearanceType::Invisibility, AppearanceType::Invisibility,
3001, 3001,
@ -3051,13 +3059,16 @@ void EntityList::UpdateVisibility(Mob *scanning_mob)
true, true,
mob->CastToClient() mob->CastToClient()
); );
}
it->second = false; it->second = false;
LogVisibilityDetail("Setting mob [{}] invisible to scanning_mob [{}]", mob->GetCleanName(), scanning_mob->GetCleanName()); LogVisibilityDetail("Setting mob [{}] invisible to scanning_mob [{}]", mob->GetCleanName(), scanning_mob->GetCleanName());
} }
// Inverse: Update mob's view of scanning_mob visibility // Inverse: Update mob's view of scanning_mob visibility
auto it_mob = mob->m_can_see_mob.find(scanning_mob->GetID()); auto it_mob = mob->m_can_see_mob.find(scanning_mob->GetID());
if (it_mob != mob->m_can_see_mob.end() && !scanning_mob->m_close_mobs.count(mob_id) && it_mob->second && scanning_mob->IsClient()) { if (it_mob != mob->m_can_see_mob.end() && !scanning_mob->m_close_mobs.count(mob_id) && it_mob->second) {
if (scanning_mob->IsClient()) {
mob->SendAppearancePacket( mob->SendAppearancePacket(
AppearanceType::Invisibility, AppearanceType::Invisibility,
3001, 3001,
@ -3065,6 +3076,8 @@ void EntityList::UpdateVisibility(Mob *scanning_mob)
true, true,
scanning_mob->CastToClient() scanning_mob->CastToClient()
); );
}
it_mob->second = false; it_mob->second = false;
LogVisibilityDetail("Setting scanning_mob [{}] invisible to mob [{}]", scanning_mob->GetCleanName(), mob->GetCleanName()); LogVisibilityDetail("Setting scanning_mob [{}] invisible to mob [{}]", scanning_mob->GetCleanName(), mob->GetCleanName());
} }