Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

Fixed widgets, signs, objects in zones that have dual maps due to different grid designs in old clients

Browse Source
This commit is contained in:
Emagi 2025-04-05 14:12:34 -04:00
parent d1d84bd7a4
commit 8b4b550b5c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/WorldServer/Spawn.cpp
View File

@ -2131,8 +2131,9 @@ void Spawn::InitializePosPacketData(Player* player, PacketStruct* packet, bool b
new_y = itr->second.offset_y; new_y = itr->second.offset_y;
if(player->GetMap() != GetMap()) { if(player->GetMap() != GetMap()) {
ground_diff = sqrtf((GetY() - itr->second.zone_ground_y) * (GetY() - itr->second.zone_ground_y)); ground_diff = itr->second.zone_ground_y - itr->second.offset_y;
} }
itr->second.timestamp = Timer::GetCurrentTime2()+1000;
} }
else { else {
auto loc = glm::vec3(GetX(), GetZ(), GetY()); auto loc = glm::vec3(GetX(), GetZ(), GetY());
@ -2140,6 +2141,7 @@ void Spawn::InitializePosPacketData(Player* player, PacketStruct* packet, bool b
float zone_ground_y = new_y; float zone_ground_y = new_y;
if(player->GetMap() != GetMap()) { if(player->GetMap() != GetMap()) {
zone_ground_y = FindBestZ(loc, nullptr, nullptr, nullptr); zone_ground_y = FindBestZ(loc, nullptr, nullptr, nullptr);
ground_diff = zone_ground_y - new_y;
} }
TimedGridData data; TimedGridData data;
data.grid_id = new_grid_id; data.grid_id = new_grid_id;
@ -2151,7 +2153,7 @@ void Spawn::InitializePosPacketData(Player* player, PacketStruct* packet, bool b
data.zone_ground_y = zone_ground_y; data.zone_ground_y = zone_ground_y;
ground_diff = sqrtf((GetY() - zone_ground_y) * (GetY() - zone_ground_y)); ground_diff = sqrtf((GetY() - zone_ground_y) * (GetY() - zone_ground_y));
data.npc_save = false; data.npc_save = false;
data.timestamp = Timer::GetCurrentTime2()+100; data.timestamp = Timer::GetCurrentTime2()+1000;
established_grid_id.insert(make_pair(packet->GetVersion(), data)); established_grid_id.insert(make_pair(packet->GetVersion(), data));
} }
} }
@ -2159,7 +2161,7 @@ void Spawn::InitializePosPacketData(Player* player, PacketStruct* packet, bool b
new_grid_id = itr->second.grid_id; new_grid_id = itr->second.grid_id;
new_widget_id = itr->second.widget_id; new_widget_id = itr->second.widget_id;
new_y = itr->second.offset_y; new_y = itr->second.offset_y;
ground_diff = sqrtf((GetY() - itr->second.zone_ground_y) * (GetY() - itr->second.zone_ground_y)); ground_diff = itr->second.zone_ground_y - itr->second.offset_y;
} }
m_GridMutex.releasewritelock(__FUNCTION__, __LINE__); m_GridMutex.releasewritelock(__FUNCTION__, __LINE__);
} }
@ -2229,7 +2231,8 @@ void Spawn::InitializePosPacketData(Player* player, PacketStruct* packet, bool b
result_y = new_y; result_y = new_y;
} }
if(GetMap() != player->GetMap()) { if(GetMap() != player->GetMap()) {
result_y = new_y; if(!IsWidget() && !IsSign() && !IsObject())
result_y = new_y;
if(IsFlyingCreature() || IsWaterCreature() || InWater()) { if(IsFlyingCreature() || IsWaterCreature() || InWater()) {
result_y += ground_diff; result_y += ground_diff;
} }