Revert 0c55855 and properly fix missing pet action bar after reloadin…

…g UI (#1570)

* Revert "Core/Pet: Fix pet action bar after reloading UI (#1513)"

This reverts commit 0c55855.

* Core/Pet: Fix pet action bar after reloading UI

Credit to @dagochen -
#1513 (comment)

src/game/MiscHandler.cpp

@@ -1506,10 +1506,12 @@ void WorldSession::HandleDismountOpcode(WorldPacket& /*recv_data*/)
 
 void WorldSession::HandleRequestPetInfoOpcode(WorldPacket& /*recv_data */)
 {
-    /*
-        DEBUG_LOG("WORLD: CMSG_REQUEST_PET_INFO");
-        recv_data.hexlike();
-    */
+    DEBUG_LOG("WORLD: CMSG_REQUEST_PET_INFO");
+
+    if (_player->GetPet())
+        _player->PetSpellInitialize();
+    else if (_player->GetCharm())
+        _player->CharmSpellInitialize();
 }
 
 void WorldSession::HandleSetTaxiBenchmarkOpcode(WorldPacket& recv_data)

src/game/PetAI.cpp

@@ -86,18 +86,6 @@ void PetAI::UpdateAI(const uint32 diff)
     else
         m_updateAlliesTimer -= diff;
 
-    // Prevent losing the pet action bar after reloading the user interface
-    if (owner && owner->GetTypeId() == TYPEID_PLAYER)
-    {
-        if (m_updatePetSpellTimer <= diff)
-        {
-            owner->ToPlayer()->PetSpellInitialize();
-            m_updatePetSpellTimer = 5 * IN_MILLISECONDS;
-        }
-        else
-            m_updatePetSpellTimer -= diff;
-    }
-
     // i_pet.GetVictim() can't be used for check in case stop fighting, i_pet.GetVictim() clear at Unit death etc.
     if (me->GetVictim() && me->GetVictim()->IsAlive())
     {

src/game/PetAI.h

@@ -60,7 +60,6 @@ class PetAI : public CreatureAI
         bool inCombat;
         std::set<uint64> m_AllySet;
         uint32 m_updateAlliesTimer;
-        uint32 m_updatePetSpellTimer;
 
         Unit* SelectNextTarget();
         void HandleReturnMovement();