Core/Misc: Reduce differences between branches

1 files changed, 2 insertions, 21 deletions

diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
index 2f3f1eb1810..129836b4b69 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
@@ -393,25 +393,6 @@ class NecroticPlagueTargetCheck
         uint32 _notAura2;
 };
 
-class HeightDifferenceCheck
-{
-    public:
-        HeightDifferenceCheck(GameObject* go, float diff, bool reverse)
-            : _baseObject(go), _difference(diff), _reverse(reverse)
-        {
-        }
-
-        bool operator()(WorldObject* unit) const
-        {
-            return (unit->GetPositionZ() - _baseObject->GetPositionZ() > _difference) != _reverse;
-        }
-
-    private:
-        GameObject* _baseObject;
-        float _difference;
-        bool _reverse;
-};
-
 class FrozenThroneResetWorker
 {
     public:
@@ -1510,7 +1491,7 @@ struct npc_valkyr_shadowguard : public ScriptedAI
                     {
                         std::list<Creature*> triggers;
                         GetCreatureListWithEntryInGrid(triggers, me, NPC_WORLD_TRIGGER, 150.0f);
-                        triggers.remove_if(HeightDifferenceCheck(platform, 5.0f, true));
+                        triggers.remove_if(Trinity::HeightDifferenceCheck(platform, 5.0f, true));
                         if (triggers.empty())
                             return;
 
@@ -2196,7 +2177,7 @@ class spell_the_lich_king_quake : public SpellScript
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         if (GameObject* platform = ObjectAccessor::GetGameObject(*GetCaster(), GetCaster()->GetInstanceScript()->GetGuidData(DATA_ARTHAS_PLATFORM)))
-            targets.remove_if(HeightDifferenceCheck(platform, 5.0f, false));
+            targets.remove_if(Trinity::HeightDifferenceCheck(platform, 5.0f, false));
     }
 
     void HandleSendEvent(SpellEffIndex /*effIndex*/)