Core/Creatures: implement SummonPropertiesFlags::DespawnOnSummonerLogout and fixed replacing totems when summoning new ones

Author: Ovahlord

src/server/game/Entities/Creature/Creature.cpp

@@ -323,8 +323,6 @@ void Creature::AddToWorld()
             // If the creature has been summoned, register it for the summoner
             if (Unit* summoner = summonInfo->GetUnitSummoner())
                 summoner->RegisterSummon(summonInfo);
-
-            HandlePostSummonActions();
         }
 
         if (GetZoneScript())
@@ -2813,7 +2811,7 @@ bool Creature::IsSummon() const
     return _summonInfo != nullptr;
 }
 
-void Creature::HandlePostSummonActions()
+void Creature::HandlePreSummonActions()
 {
     SummonInfo* summonInfo = ASSERT_NOTNULL(GetSummonInfo());
 

src/server/game/Entities/Creature/Creature.h

@@ -430,8 +430,8 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma
 
         bool IsSummon() const override;
 
-        // Handles all summon relation actions, such as setting guid values, casting passives and initializing the control status
-        void HandlePostSummonActions();
+        // Handles all summon based actions which happen before the creature is being added to the world
+        void HandlePreSummonActions();
 
     protected:
         bool CreateFromProto(ObjectGuid::LowType guidlow, uint32 entry, CreatureData const* data = nullptr, uint32 vehId = 0);

src/server/game/Entities/Creature/SummonInfo/SummonInfo.cpp

@@ -157,7 +157,7 @@ void SummonInfo::SetUseSummonerFaction(bool set)
 
 bool SummonInfo::IsControlledBySummoner() const
 {
-    return _control > SummonPropertiesControl::None;
+    return _control > SummonPropertiesControl::None && _control < SummonPropertiesControl::Vehicle;
 }
 
 SummonPropertiesSlot SummonInfo::GetSummonSlot() const

src/server/game/Entities/Creature/SummonInfo/SummonInfo.h

@@ -43,11 +43,11 @@ class TC_GAME_API SummonInfo
 
     // Initializes additional settings based on the provided SummonProperties ID.
     void InitializeSummonProperties(uint32 summonPropertiesId, Unit const* summoner);
-    // Returns the creature that is tied to this SummonInfo instance.
+    // Returns the creature that is tied to this SummonInfo instance. This pointer can never be null.
     Creature* GetSummonedCreature() const;
-    // Returns the Unit summoner, or nullptr if no summoner has been provided or if the summoner is not an Unit.
+    // Returns the Unit summoner that has summoned the creature, or nullptr if no summoner has been provided or if the summoner is not an Unit.
     Unit* GetUnitSummoner() const;
-    // Returns the GameObject summoner, or nullptr if no summoner has been provided or if the summoner is not a GameObject.
+    // Returns the GameObject summoner that has summoned the creature, or nullptr if no summoner has been provided or if the summoner is not a GameObject.
     GameObject* GetGameObjectSummoner() const;
 
     // Returns the remaining time until the summon expires. Nullopt when no duration was set which implies that the summon is permanent.

src/server/game/Entities/Creature/TemporarySummon.cpp

@@ -181,12 +181,6 @@ void TempSummon::InitStats(uint32 duration)
 
     if (owner)
     {
-        int32 slot = m_Properties->Slot;
-        if (slot > 0)
-        {
-            owner->m_SummonSlot[slot] = GetGUID();
-        }
-
         if (m_Properties->Control != SUMMON_CATEGORY_WILD)
         {
             // Summons inherit their player summoner's guild data
@@ -200,9 +194,6 @@ void TempSummon::InitStats(uint32 duration)
                 }
             }
         }
-
-        if (owner->IsTotem())
-            owner->m_Controlled.insert(this);
     }
 }
 
@@ -266,15 +257,6 @@ void TempSummon::RemoveFromWorld()
     if (!IsInWorld())
         return;
 
-    if (m_Properties)
-    {
-        int32 slot = m_Properties->Slot;
-        if (slot > 0)
-            if (Unit* owner = GetSummoner())
-                if (owner->m_SummonSlot[slot] == GetGUID())
-                    owner->m_SummonSlot[slot].Clear();
-    }
-
     //if (GetOwnerGUID())
     //    TC_LOG_ERROR("entities.unit", "Unit %u has owner guid when removed from world", GetEntry());
 

src/server/game/Entities/Object/Object.cpp

@@ -38,14 +38,15 @@
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "OutdoorPvPMgr.h"
-#include "PhasingHandler.h"
 #include "PathGenerator.h"
+#include "PhasingHandler.h"
 #include "Player.h"
 #include "ReputationMgr.h"
 #include "SpellAuraEffects.h"
 #include "SpellDefines.h"
 #include "SpellMgr.h"
 #include "StringConvert.h"
+#include "SummonInfo.h"
 #include "SummonInfoArgs.h"
 #include "TemporarySummon.h"
 #include "Totem.h"
@@ -55,9 +56,9 @@
 #include "UpdateFieldFlags.h"
 #include "UpdateMask.h"
 #include "Util.h"
-#include "Vehicle.h"
 #include "VMapFactory.h"
 #include "VMapManager2.h"
+#include "Vehicle.h"
 #include "WaypointMovementGenerator.h"
 #include "World.h"
 #include "WorldPacket.h"
@@ -2118,6 +2119,7 @@ TempSummon* Map::SummonCreature(uint32 entry, Position const& pos, SummonCreatur
     }
 
     summon->SetHomePosition(pos);
+    summon->HandlePreSummonActions();
     summon->InitStats(summonArgs.SummonDuration);
     summon->SetPrivateObjectOwner(summonArgs.PrivateObjectOwner);
 

src/server/game/Entities/Totem/Totem.cpp

@@ -95,16 +95,6 @@ void Totem::UnSummon(uint32 msTime)
     CombatStop();
     RemoveAurasDueToSpell(GetSpell(), GetGUID());
 
-    // clear owner's totem slot
-    for (uint8 i = SUMMON_SLOT_TOTEM_FIRE; i < MAX_TOTEM_SLOT; ++i)
-    {
-        if (GetOwner()->m_SummonSlot[i] == GetGUID())
-        {
-            GetOwner()->m_SummonSlot[i].Clear();
-            break;
-        }
-    }
-
     GetOwner()->RemoveAurasDueToSpell(GetSpell(), GetGUID());
 
     // remove aura all party members too

src/server/game/Entities/Unit/Unit.cpp

@@ -6117,10 +6117,10 @@ void Unit::RemoveAllControlled()
         m_Controlled.erase(m_Controlled.begin());
         if (target->GetCharmerGUID() == GetGUID())
             target->RemoveCharmAuras();
-        else if (target->GetOwnerOrCreatorGUID() == GetGUID() && target->IsSummon())
+        else if (target->GetOwnerGUID() == GetGUID() && target->IsSummon())
             target->ToTempSummon()->UnSummon();
-        else
-            TC_LOG_ERROR("entities.unit", "Unit %u is trying to release unit %u which is neither charmed nor owned by it", GetEntry(), target->GetEntry());
+        //else
+        //    TC_LOG_ERROR("entities.unit", "Unit %u is trying to release unit %u which is neither charmed nor owned by it", GetEntry(), target->GetEntry());
     }
     if (GetPetGUID())
         TC_LOG_FATAL("entities.unit", "Unit %u is not able to release its pet %s", GetEntry(), GetPetGUID().ToString().c_str());
@@ -8874,6 +8874,21 @@ void Unit::UnregisterSummon(SummonInfo* summon)
     _slottedSummons[targetSlot] = nullptr;
 }
 
+void Unit::DespawnSummonsOnSummonerLogout()
+{
+    // Summons which are stored in a summon slot will always despawn
+    std::vector<SummonInfo*> slottedSummons = _slottedSummons;
+    for (SummonInfo* summon : slottedSummons)
+        if (summon)
+            summon->GetSummonedCreature()->DespawnOrUnsummon();
+
+    // Wild summons on the other hand only despawn when the according flag is set
+    std::vector<SummonInfo*> wildSummons = _wildSummons;
+    for (SummonInfo* summon : wildSummons)
+        if (summon->DespawnsOnSummonerLogout())
+            summon->GetSummonedCreature()->DespawnOrUnsummon();
+}
+
 SummonInfo* Unit::GetSummonInSlot(SummonPropertiesSlot slot) const
 {
     if (slot == SummonPropertiesSlot::None ||
@@ -9690,7 +9705,7 @@ void Unit::RemoveFromWorld()
         RemoveAllDynObjects();
 
         ExitVehicle();  // Remove applied auras with SPELL_AURA_CONTROL_VEHICLE
-        UnsummonAllTotems();
+        DespawnSummonsOnSummonerLogout();
         RemoveAllControlled();
 
         RemoveAreaAurasDueToLeaveWorld();

src/server/game/Entities/Unit/Unit.h

@@ -1337,6 +1337,8 @@ class TC_GAME_API Unit : public WorldObject
         void RegisterSummon(SummonInfo* summon);
         // Unregisters the SummonInfo API of a summoned creature so it can no longer be accessed
         void UnregisterSummon(SummonInfo* summon);
+        // Despawns all summons that should despawn when the summoner logs out or despawns
+        void DespawnSummonsOnSummonerLogout();
 
         // Returns the currently active summon that is the summoner's specified summon slot
         SummonInfo* GetSummonInSlot(SummonPropertiesSlot slot) const;

src/server/game/Handlers/SpellHandler.cpp

@@ -429,7 +429,7 @@ void WorldSession::HandleTotemDestroyed(WorldPackets::Totem::TotemDestroyed& pac
         return;
 
     SummonInfo* summonInfo = _player->GetSummonInSlot(slot);
-    if (!summonInfo)
+    if (!summonInfo || summonInfo->GetSummonedCreature()->GetGUID() != packet.TotemGUID)
         return;
 
     summonInfo->GetSummonedCreature()->DespawnOrUnsummon();