Core/StatsSystem: Fixing up "fucked up logic".

Nayd's Seal of Approval.

1 files changed, 1 insertions, 5 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 4d2934f5842..e8ac91eb145 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -15675,11 +15675,7 @@ void Unit::ApplyResilience(Unit const* victim, int32* damage, bool isCrit) const
         return;
 
     // Don't consider resilience if not in PvP - player or pet
-    bool isAllowedSource = (GetTypeId() == TYPEID_PLAYER);
-    if (!isAllowedSource && GetTypeId() == TYPEID_UNIT && GetOwner() && GetOwner()->GetTypeId() == TYPEID_PLAYER)
-        isAllowedSource = true;
-
-    if (!isAllowedSource)
+    if (!GetCharmerOrOwnerPlayerOrPlayerItself())
         return;
 
     Unit const* target = NULL;