From 83bc908531d827b318d1281fa686aa95a34ab075 Mon Sep 17 00:00:00 2001 From: DeadMouse Date: Sat, 13 May 2023 19:16:37 +0300 Subject: Core/Battlegrounds: Correct distance check in HandleAreaSpiritHealerQueryOpcode and HandleAreaSpiritHealerQueueOpcode. (#28979) --- src/server/game/Battlegrounds/Battleground.h | 2 -- src/server/game/Handlers/BattleGroundHandler.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index bfa4cec6dbe..1bca27efc86 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -549,8 +549,6 @@ class TC_GAME_API Battleground : public ZoneScript // Player lists, those need to be accessible by inherited classes BattlegroundPlayerMap m_Players; - // Spirit Guide guid + Player list GUIDS - std::map m_ReviveQueue; // these are important variables used for starting messages uint8 m_Events; diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 1fafa48e9a9..7103b0adce3 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -662,7 +662,7 @@ void WorldSession::HandleAreaSpiritHealerQueryOpcode(WorldPackets::Battleground: if (!spiritHealer->IsAreaSpiritHealer()) return; - if (_player->GetExactDist(spiritHealer) > MAX_AREA_SPIRIT_HEALER_RANGE) + if (!_player->IsWithinDistInMap(spiritHealer, MAX_AREA_SPIRIT_HEALER_RANGE)) return; if (spiritHealer->IsAreaSpiritHealerIndividual()) @@ -691,7 +691,7 @@ void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPackets::Battleground: if (!spiritHealer->IsAreaSpiritHealer()) return; - if (_player->GetExactDist(spiritHealer) > MAX_AREA_SPIRIT_HEALER_RANGE) + if (!_player->IsWithinDistInMap(spiritHealer, MAX_AREA_SPIRIT_HEALER_RANGE)) return; _player->SetAreaSpiritHealer(spiritHealer); -- cgit v1.2.3