Update Player

when gm is activated players can not attack pets.
mangostwo · Feb 13, 2025 · 80fa56f · 80fa56f
1 parent 68556f2
commit 80fa56f
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp
@@ -2691,6 +2691,13 @@ void Player::SetGameMaster(bool on)
         GetHostileRefManager().setOnlineOfflineState(false);
         CombatStopWithPets();
 
+        if (Pet* pet = GetPet())
+        {
+            if (m_ExtraFlags |= PLAYER_EXTRA_GM_ON)
+                pet->setFaction(35);
+            pet->GetHostileRefManager().setOnlineOfflineState(false);
+        }
+
         SetPhaseMask(PHASEMASK_ANYWHERE, false);            // see and visible in all phases
     }
     else
@@ -2704,6 +2711,12 @@ void Player::SetGameMaster(bool on)
         AuraList const& phases = GetAurasByType(SPELL_AURA_PHASE);
         SetPhaseMask(!phases.empty() ? phases.front()->GetMiscValue() : uint32(PHASEMASK_NORMAL), false);
 
+        if (Pet* pet = GetPet())
+        {
+            pet->setFaction(getFaction());
+            pet->GetHostileRefManager().setOnlineOfflineState(true);
+        }
+
         CallForAllControlledUnits(SetGameMasterOffHelper(getFaction()), CONTROLLED_PET | CONTROLLED_TOTEMS | CONTROLLED_GUARDIANS | CONTROLLED_CHARM);
 
         // restore FFA PvP Server state