From bad751f82148a43f0c4a97795b1ee8b180866954 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 23 May 2023 06:48:21 -0400 Subject: [PATCH] Core/Battlegrounds: Correct distance check in HandleAreaSpiritHealerQueryOpcode and HandleAreaSpiritHealerQueueOpcode. Port From (https://github.com/TrinityCore/TrinityCore/commit/83bc908531d827b318d1281fa686aa95a34ab075) --- Source/Game/BattleGrounds/BattleGround.cs | 3 --- Source/Game/Handlers/BattleGroundHandler.cs | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Source/Game/BattleGrounds/BattleGround.cs b/Source/Game/BattleGrounds/BattleGround.cs index 86dae274f..4d38b2f36 100644 --- a/Source/Game/BattleGrounds/BattleGround.cs +++ b/Source/Game/BattleGrounds/BattleGround.cs @@ -1888,7 +1888,6 @@ namespace Game.BattleGrounds public Dictionary GetPlayers() { return m_Players; } uint GetPlayersSize() { return (uint)m_Players.Count; } uint GetPlayerScoresSize() { return (uint)PlayerScores.Count; } - uint GetReviveQueueSize() { return (uint)m_ReviveQueue.Count; } public void SetBgMap(BattlegroundMap map) { m_Map = map; } BattlegroundMap FindBgMap() { return m_Map; } @@ -1964,8 +1963,6 @@ namespace Game.BattleGrounds protected Dictionary PlayerScores = new(); // Player scores // Player lists, those need to be accessible by inherited classes Dictionary m_Players = new(); - // Spirit Guide guid + Player list GUIDS - MultiMap m_ReviveQueue = new(); // these are important variables used for starting messages BattlegroundEventFlags m_Events; diff --git a/Source/Game/Handlers/BattleGroundHandler.cs b/Source/Game/Handlers/BattleGroundHandler.cs index 6e9b6b8c3..860f11cde 100644 --- a/Source/Game/Handlers/BattleGroundHandler.cs +++ b/Source/Game/Handlers/BattleGroundHandler.cs @@ -627,7 +627,7 @@ namespace Game if (!spiritHealer.IsAreaSpiritHealer()) return; - if (_player.GetExactDist(spiritHealer) > PlayerConst.MaxAreaSpiritHealerRange) + if (!_player.IsWithinDistInMap(spiritHealer, PlayerConst.MaxAreaSpiritHealerRange)) return; if (spiritHealer.IsAreaSpiritHealerIndividual()) @@ -662,7 +662,7 @@ namespace Game if (!spiritHealer.IsAreaSpiritHealer()) return; - if (_player.GetExactDist(spiritHealer) > PlayerConst.MaxAreaSpiritHealerRange) + if (!_player.IsWithinDistInMap(spiritHealer, PlayerConst.MaxAreaSpiritHealerRange)) return; _player.SetAreaSpiritHealer(spiritHealer);