From 03d2737eb8368608a6f4ee2ce8e9e33369c1ce50 Mon Sep 17 00:00:00 2001 From: chaosua <544218+chaosua@users.noreply.github.com> Date: Tue, 21 Jan 2025 12:06:43 +0200 Subject: [PATCH 1/4] Exclude Dalaran Sewer Exit Pipe from GUARD teleport checks fixes horde player teleport when dalaran sewer pipe is entered closes https://github.com/azerothcore/azerothcore-wotlk/issues/4467 --- src/server/scripts/Northrend/zone_dalaran.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 6d2d5aeac98d21..c83b2ef886de7d 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -444,7 +444,7 @@ class npc_mageguard_dalaran : public CreatureScript void MoveInLineOfSight(Unit* who) override { - if (!who || !who->IsInWorld() || who->GetZoneId() != 4395) + if (!who || !who->IsInWorld() || who->GetZoneId() != 4395 || who->GetAreaId()==4569) return; if (!me->IsWithinDist(who, 5.0f, false)) From 4382b9643d6b2e4b831708e8a47ee8811e7f8a8d Mon Sep 17 00:00:00 2001 From: chaosua <544218+chaosua@users.noreply.github.com> Date: Thu, 6 Feb 2025 17:49:33 +0200 Subject: [PATCH 2/4] Update zone_dalaran.cpp --- src/server/scripts/Northrend/zone_dalaran.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index c83b2ef886de7d..61616fea1c7b98 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -443,8 +443,8 @@ class npc_mageguard_dalaran : public CreatureScript void AttackStart(Unit* /*who*/) override {} void MoveInLineOfSight(Unit* who) override - { - if (!who || !who->IsInWorld() || who->GetZoneId() != 4395 || who->GetAreaId()==4569) + { // Dalaran Sewer Exit Pipe + if (!who || !who->IsInWorld() || who->GetZoneId() != 4395 || who->GetAreaId() == 4569) return; if (!me->IsWithinDist(who, 5.0f, false)) From 764be3924a7d7d3c0db239dcd91a1eff3fd506a4 Mon Sep 17 00:00:00 2001 From: chaosua <544218+chaosua@users.noreply.github.com> Date: Thu, 6 Feb 2025 18:21:35 +0200 Subject: [PATCH 3/4] Update zone_dalaran.cpp --- src/server/scripts/Northrend/zone_dalaran.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 61616fea1c7b98..48aa3aff77f95a 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -443,7 +443,7 @@ class npc_mageguard_dalaran : public CreatureScript void AttackStart(Unit* /*who*/) override {} void MoveInLineOfSight(Unit* who) override - { // Dalaran Sewer Exit Pipe + { /* Dalaran Sewer Exit Pipe */ if (!who || !who->IsInWorld() || who->GetZoneId() != 4395 || who->GetAreaId() == 4569) return; From 6fda84df2e709fe16f8ca755324274e3ed479ad9 Mon Sep 17 00:00:00 2001 From: sudlud Date: Thu, 6 Feb 2025 20:45:36 +0100 Subject: [PATCH 4/4] Update zone_dalaran.cpp --- src/server/scripts/Northrend/zone_dalaran.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 48aa3aff77f95a..cc217eadaec1e0 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -443,8 +443,10 @@ class npc_mageguard_dalaran : public CreatureScript void AttackStart(Unit* /*who*/) override {} void MoveInLineOfSight(Unit* who) override - { /* Dalaran Sewer Exit Pipe */ - if (!who || !who->IsInWorld() || who->GetZoneId() != 4395 || who->GetAreaId() == 4569) + { + // 4395 Dalaran + // 4569 Sewer Exit Pipe + if (!who || !who->IsInWorld()|| who->GetZoneId() != 4395 || who->GetAreaId() == 4569) return; if (!me->IsWithinDist(who, 5.0f, false))