pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1142 from noudess/waterroam

Browse Source 
Allow water based roamboxes again.
This commit is contained in:
Alex 2020-12-07 14:07:59 -08:00 committed by GitHub
commit ff4c9e1e70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/mob_ai.cpp
View File

@ -1605,6 +1605,7 @@ void NPC::AI_DoMovement() {
* if the roam box was sloppily configured * if the roam box was sloppily configured
*/ */
if (!this->GetWasSpawnedInWater()) { if (!this->GetWasSpawnedInWater()) {
roambox_destination_z = GetGroundZ(roambox_destination_x, roambox_destination_y);
if (zone->HasMap() && zone->HasWaterMap()) { if (zone->HasMap() && zone->HasWaterMap()) {
auto position = glm::vec3( auto position = glm::vec3(
roambox_destination_x, roambox_destination_x,
@ -1629,6 +1630,17 @@ void NPC::AI_DoMovement() {
} }
} }
} }
else { // Mob was in water, make sure new spot is in water also
roambox_destination_z = m_Position.z;
auto position = glm::vec3( roambox_destination_x,
roambox_destination_y,
m_Position.z + 15);
if (!zone->watermap->InLiquid(position)) {
roambox_destination_x = m_SpawnPoint.x;
roambox_destination_y = m_SpawnPoint.y;
roambox_destination_z = m_SpawnPoint.z;
}
}
PathfinderOptions opts; PathfinderOptions opts;
opts.smooth_path = true; opts.smooth_path = true;
@ -1643,7 +1655,7 @@ void NPC::AI_DoMovement() {
glm::vec3( glm::vec3(
roambox_destination_x, roambox_destination_x,
roambox_destination_y, roambox_destination_y,
GetGroundZ(roambox_destination_x, roambox_destination_y) roambox_destination_z
), ),
partial, partial,
stuck, stuck,
@ -1659,8 +1671,6 @@ void NPC::AI_DoMovement() {
return; return;
} }
roambox_destination_z = 0;
Log( Log(
Logs::General, Logs::General,
Logs::NPCRoamBox, Logs::NPCRoamBox,