pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-20 17:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix zone startup crash if maps not installed

Browse Source
This commit is contained in:
hg 2020-08-21 18:10:27 -04:00
parent 0f5a7e1317
commit 896dd48960
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/mob_ai.cpp
View File

@ -1637,7 +1637,7 @@ void NPC::AI_DoMovement() {
roambox_destination_y, roambox_destination_y,
m_Position.z + 15 m_Position.z + 15
); );
if (!zone->watermap->InLiquid(position)) { if (zone->HasWaterMap() && !zone->watermap->InLiquid(position)) {
roambox_destination_x = m_SpawnPoint.x; roambox_destination_x = m_SpawnPoint.x;
roambox_destination_y = m_SpawnPoint.y; roambox_destination_y = m_SpawnPoint.y;
roambox_destination_z = m_SpawnPoint.z; roambox_destination_z = m_SpawnPoint.z;

2
zone/object.cpp
View File

@ -463,7 +463,7 @@ void Object::RandomSpawn(bool send_packet) {
m_data.x = zone->random.Real(m_min_x, m_max_x); m_data.x = zone->random.Real(m_min_x, m_max_x);
m_data.y = zone->random.Real(m_min_y, m_max_y); m_data.y = zone->random.Real(m_min_y, m_max_y);
if(m_data.z == BEST_Z_INVALID) { if (m_data.z == BEST_Z_INVALID && zone->HasMap()) {
glm::vec3 me; glm::vec3 me;
me.x = m_data.x; me.x = m_data.x;
me.y = m_data.y; me.y = m_data.y;

4
zone/zone.cpp
View File

@ -275,7 +275,9 @@ bool Zone::LoadZoneObjects()
position.y = data.y; position.y = data.y;
position.z = data.z; position.z = data.z;
data.z = zone->zonemap->FindBestZ(position, nullptr); if (zone->HasMap()) {
data.z = zone->zonemap->FindBestZ(position, nullptr);
}
EQ::ItemInstance *inst = nullptr; EQ::ItemInstance *inst = nullptr;
// FatherNitwit: this dosent seem to work... // FatherNitwit: this dosent seem to work...