aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDeadMouse <maximinua08@gmail.com>2023-05-13 19:16:37 +0300
committerGitHub <noreply@github.com>2023-05-13 18:16:37 +0200
commit83bc908531d827b318d1281fa686aa95a34ab075 (patch)
treede04a2594a548d5a13aaf04d11f97adf998af905 /src
parent3f2d62f9d6c78a299744394bac357b6459e1d4a6 (diff)
Core/Battlegrounds: Correct distance check in HandleAreaSpiritHealerQueryOpcode and HandleAreaSpiritHealerQueueOpcode. (#28979)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Battlegrounds/Battleground.h2
-rw-r--r--src/server/game/Handlers/BattleGroundHandler.cpp4
2 files changed, 2 insertions, 4 deletions
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<ObjectGuid, GuidVector> 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);