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

[Bug Fix] Fix issue with mobs summoning PCs into ceilings (#1921)

Browse Source
This commit is contained in:
Paul Coene 2022-01-29 20:55:40 -05:00 committed by GitHub
parent a6cd0bc33a
commit 7749c626f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zone/mob.cpp
View File

@ -3594,7 +3594,10 @@ bool Mob::HateSummon() {
if(summon_level == 1) { if(summon_level == 1) {
entity_list.MessageClose(this, true, 500, Chat::Say, "%s says 'You will not evade me, %s!' ", GetCleanName(), target->GetCleanName() ); entity_list.MessageClose(this, true, 500, Chat::Say, "%s says 'You will not evade me, %s!' ", GetCleanName(), target->GetCleanName() );
float summoner_zoff = this->GetZOffset();
float summoned_zoff = target->GetZOffset();
auto new_pos = m_Position; auto new_pos = m_Position;
new_pos.z -= (summoner_zoff - summoned_zoff);
float angle = new_pos.w - target->GetHeading(); float angle = new_pos.w - target->GetHeading();
new_pos.w = target->GetHeading(); new_pos.w = target->GetHeading();

2
zone/waypoints.cpp
View File

@ -958,6 +958,7 @@ void Mob::TryMoveAlong(float distance, float angle, bool send)
} }
new_pos.z = GetFixedZ(new_pos); new_pos.z = GetFixedZ(new_pos);
Teleport(new_pos); Teleport(new_pos);
} }
@ -971,7 +972,6 @@ glm::vec4 Mob::TryMoveAlong(const glm::vec4 &start, float distance, float angle)
glm::vec3 new_pos = start; glm::vec3 new_pos = start;
new_pos.x += distance * g_Math.FastSin(angle); new_pos.x += distance * g_Math.FastSin(angle);
new_pos.y += distance * g_Math.FastCos(angle); new_pos.y += distance * g_Math.FastCos(angle);
new_pos.z += GetZOffset();
if (zone->HasMap()) { if (zone->HasMap()) {
if (zone->zonemap->LineIntersectsZone(start, new_pos, 0.0f, &tmp_pos)) if (zone->zonemap->LineIntersectsZone(start, new_pos, 0.0f, &tmp_pos))