From 548447ffb02ddd357bf61774436c136c6efa9f20 Mon Sep 17 00:00:00 2001
From: Anton Popovichenko <walkline.ua@gmail.com>
Date: Thu, 31 Jul 2025 19:45:24 +0200
Subject: [PATCH] fix(Core/Pet): Fix player pets attack (#22601)

Co-authored-by: PkllonG <PkllonG@users.noreply.github.com>
---
 src/server/game/Entities/Creature/Creature.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 34f5267d7..7a7025296 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2683,15 +2683,13 @@ bool Creature::CanCreatureAttack(Unit const* victim, bool skipDistCheck) const
     if (skipDistCheck)
         return true;
 
-    float dist = sWorld->getFloatConfig(CONFIG_CREATURE_LEASH_RADIUS);
-
     if (Unit* unit = GetCharmerOrOwner())
     {
-        float visibilityDist = std::min<float>(GetMap()->GetVisibilityRange() + GetObjectSize() * 2, 150.0f);
-        if (!victim->IsWithinDist(unit, visibilityDist))
-            return false;
+        float visibilityDist = std::min<float>(GetMap()->GetVisibilityRange() + GetObjectSize() * 2, DEFAULT_VISIBILITY_DISTANCE);
+        return victim->IsWithinDist(unit, visibilityDist);
     }
 
+    float dist = sWorld->getFloatConfig(CONFIG_CREATURE_LEASH_RADIUS);
     if (!dist)
         return true;