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

Merge branch 'master' into shared_tasks

Browse Source
This commit is contained in:
Michael Cook (mackal) 2019-05-16 22:21:31 -04:00
commit 358ce2ca94
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/net/daybreak_connection.cpp
View File

@ -942,7 +942,7 @@ uint32_t Deflate(const uint8_t* in, uint32_t in_len, uint8_t* out, uint32_t out_
zstream.avail_in = in_len; zstream.avail_in = in_len;
zstream.opaque = Z_NULL; zstream.opaque = Z_NULL;
deflateInit(&zstream, Z_FINISH); deflateInit(&zstream, Z_BEST_SPEED);
zstream.next_out = out; zstream.next_out = out;
zstream.avail_out = out_len; zstream.avail_out = out_len;

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.");

8
zone/npc_scale_manager.cpp
View File

@ -416,14 +416,14 @@ int8 NpcScaleManager::GetNPCScalingType(NPC *&npc)
{ {
std::string npc_name = npc->GetName(); std::string npc_name = npc->GetName();
if (npc->IsRareSpawn() || npc_name.find('#') != std::string::npos || isupper(npc_name[0])) {
return 1;
}
if (npc->IsRaidTarget()) { if (npc->IsRaidTarget()) {
return 2; return 2;
} }
if (npc->IsRareSpawn() || npc_name.find('#') != std::string::npos || isupper(npc_name[0])) {
return 1;
}
return 0; return 0;
} }

2
zone/pathfinder_nav_mesh.cpp
View File

@ -163,7 +163,7 @@ IPathfinder::IPath PathfinderNavmesh::FindPath(const glm::vec3 &start, const glm
static const int max_polys = 256; static const int max_polys = 256;
dtPolyRef start_ref; dtPolyRef start_ref;
dtPolyRef end_ref; dtPolyRef end_ref;
glm::vec3 ext(5.0f, 100.0f, 5.0f); glm::vec3 ext(10.0f, 200.0f, 10.0f);
m_impl->query->findNearestPoly(&current_location[0], &ext[0], &filter, &start_ref, 0); m_impl->query->findNearestPoly(&current_location[0], &ext[0], &filter, &start_ref, 0);
m_impl->query->findNearestPoly(&dest_location[0], &ext[0], &filter, &end_ref, 0); m_impl->query->findNearestPoly(&dest_location[0], &ext[0], &filter, &end_ref, 0);