Core/Creatures: totem slot summons will now despawn when the summoner…

… dies
The-Cataclysm-Preservation-Project · Oct 25, 2023 · 6575616 · 6575616
1 parent 2aa9804
commit 6575616
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/server/game/Entities/Creature/TemporarySummon/NewTemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon/NewTemporarySummon.cpp
@@ -280,7 +280,14 @@ Unit* NewTemporarySummon::GetInternalSummoner() const
 
 bool NewTemporarySummon::ShouldDespawnOnSummonerDeath() const
 {
-    return _summonProperties && _summonProperties->GetFlags().HasFlag(SummonPropertiesFlags::DespawnOnSummonerDeath);
+    if (_summonProperties && _summonProperties->GetFlags().HasFlag(SummonPropertiesFlags::DespawnOnSummonerDeath))
+        return true;
+
+    // Totem slot summons will also despawn when the summoner has died
+    if (AsUnderlyingType(_summonSlot) >= AsUnderlyingType(SummonPropertiesSlot::Totem1) && AsUnderlyingType(_summonSlot) <= AsUnderlyingType(SummonPropertiesSlot::Totem4))
+        return true;
+
+    return false;
 }
 
 bool NewTemporarySummon::ShouldDespawnOnSummonerLogout() const