From 226408329a8a437ac3ba0925a7b96959d460dfda Mon Sep 17 00:00:00 2001
From: Webdrian <89680380+Webdrian@users.noreply.github.com>
Date: Sun, 6 Aug 2023 02:08:34 +0200
Subject: [PATCH] fix(Core/Pets): Corret Pet size for normal and exotics &
 bigger pets (#16910)

* fix(Core/Pet)

Pet size fixed

* Update Pet.cpp

* Update Pet.cpp
---
 src/server/game/Entities/Pet/Pet.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 857147253..7f3fd9e6f 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -2492,13 +2492,22 @@ float Pet::GetNativeObjectScale() const
             scale = creatureFamily->minScale + float(GetLevel() - creatureFamily->minScaleLevel) / creatureFamily->maxScaleLevel * (creatureFamily->maxScale - creatureFamily->minScale);
 
         if (CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetNativeDisplayId()))
+        {
             if (displayInfo->scale > 1.f && GetCreatureTemplate()->IsExotic())
+            {
+                // Exotic pets have a scale of 1
+                scale = 1.0f;
+            }
+            else
+            {
                 scale *= displayInfo->scale;
+            }
+        }
 
         return scale;
     }
-
-    return Guardian::GetNativeObjectScale();
+    // Fallback value if the conditions are not met
+    return 1.0f;
 }
 
 std::string Pet::GenerateActionBarData() const