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

Merge

Browse Source
This commit is contained in:
Noudess 2019-04-12 10:50:11 -04:00
parent f18b9c99b5
commit 762de03be7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zone/mob_ai.cpp
View File

@ -447,7 +447,7 @@ void Mob::AI_Init()
maxLastFightingDelayMoving = RuleI(NPC, LastFightingDelayMovingMax); maxLastFightingDelayMoving = RuleI(NPC, LastFightingDelayMovingMax);
pDontHealMeBefore = 0; pDontHealMeBefore = 0;
pDontBuffMeBefore = 0; pDontBuffMeBefore = Timer::GetCurrentTime() + 400;
pDontDotMeBefore = 0; pDontDotMeBefore = 0;
pDontRootMeBefore = 0; pDontRootMeBefore = 0;
pDontSnareMeBefore = 0; pDontSnareMeBefore = 0;
@ -1636,11 +1636,12 @@ void NPC::AI_DoMovement() {
} }
} }
glm::vec3 destination; roambox_destination_z = 0;
destination.x = roambox_destination_x; /*
destination.y = roambox_destination_y; if (zone->zonemap) {
destination.z = m_Position.z; roambox_destination_z = FindGroundZ(roambox_destination_x, roambox_destination_y, this->GetZOffset());
roambox_destination_z = zone->zonemap ? zone->zonemap->FindClosestZ(destination, nullptr) + this->GetZOffset() : 0; }
*/
Log(Logs::Detail, Log(Logs::Detail,
Logs::NPCRoamBox, Logs::NPCRoamBox,
@ -1799,7 +1800,6 @@ void NPC::AI_SetupNextWaypoint() {
else { else {
pause_timer_complete = false; pause_timer_complete = false;
Log(Logs::Detail, Logs::Pathing, "We are departing waypoint %d.", cur_wp); Log(Logs::Detail, Logs::Pathing, "We are departing waypoint %d.", cur_wp);
//if we were under quest control (with no grid), we are done now.. //if we were under quest control (with no grid), we are done now..
if (cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) { if (cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) {
Log(Logs::Detail, Logs::Pathing, "Non-grid quest mob has reached its quest ordered waypoint. Leaving pathing mode."); Log(Logs::Detail, Logs::Pathing, "Non-grid quest mob has reached its quest ordered waypoint. Leaving pathing mode.");