EQ2/Emu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

address respawning/zoning with wrong grid id

Browse Source
This commit is contained in:
Emagi 2025-08-20 11:55:15 -04:00
parent d593ceafff
commit e0356472d6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/WorldServer/client.cpp
View File

@ -739,7 +739,7 @@ void Client::SendControlGhost(int32 send_id, int8 unknown2) {
void Client::BeginPreCharInfo() { void Client::BeginPreCharInfo() {
if (!IsReadyForSpawns()) { if (!IsReadyForSpawns()) {
if (GetPlayer()->GetMap()) { if (GetPlayer()->GetMap()) {
if(!GetPlayer()->GetLocation()) { // find the appropriate grid id if(!firstlogin) { // find the appropriate grid id
auto loc = glm::vec3(GetPlayer()->GetX(), GetPlayer()->GetZ(), GetPlayer()->GetY()); auto loc = glm::vec3(GetPlayer()->GetX(), GetPlayer()->GetZ(), GetPlayer()->GetY());
uint32 GridID = 0; uint32 GridID = 0;
float new_z = GetPlayer()->FindBestZ(loc, nullptr, &GridID); float new_z = GetPlayer()->FindBestZ(loc, nullptr, &GridID);
@ -5745,6 +5745,7 @@ bool Client::ChangeLevel(int16 old_level, int16 new_level, int32 xp_earned) {
if (GetPlayer()->GetHP() < GetPlayer()->GetTotalHP() || GetPlayer()->GetPower() < GetPlayer()->GetTotalPower()) if (GetPlayer()->GetHP() < GetPlayer()->GetTotalHP() || GetPlayer()->GetPower() < GetPlayer()->GetTotalPower())
GetPlayer()->GetZone()->AddDamagedSpawn(GetPlayer()); GetPlayer()->GetZone()->AddDamagedSpawn(GetPlayer());
if(playerScript || playerZoneScript) { if(playerScript || playerZoneScript) {
std::vector<LuaArg> args = { std::vector<LuaArg> args = {
LuaArg(GetPlayer()->GetZone()), LuaArg(GetPlayer()->GetZone()),