Merge 3.3.5 to 3.3.5-solocraft

Github Actions · Github Actions · commit d42fa18117e3 · 2026-06-15T02:52:21.000Z
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
@@ -288,7 +288,7 @@ uint32 ThreatManager::GetThreatListPlayerCount(bool includeOffline/* = false*/)
         return uint32(_sortedThreatList->size());
     uint32 returnValue = 0;
     for (ThreatReference const* ref : *_sortedThreatList)
-        if (ref->IsAvailable() && ref->GetOwner()->GetTypeId() == TYPEID_PLAYER)
+        if (ref->IsAvailable() && ref->GetVictim()->GetTypeId() == TYPEID_PLAYER)
             ++returnValue;
     return returnValue;
 }
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
@@ -5198,7 +5198,7 @@ void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage const* log)
 {
     WorldPackets::CombatLog::SpellNonMeleeDamageLog packet;
     packet.Me = log->target->GetGUID();
-    packet.CasterGUID = log->attacker->GetGUID();
+    packet.CasterGUID = Object::GetGUID(log->attacker);
     packet.SpellID = log->SpellID;
     packet.Damage = log->damage;
     if (log->damage > log->target->GetHealth())

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ uint32 ThreatManager::GetThreatListPlayerCount(bool includeOffline/* = false*/)`
`288`	`288`	`return uint32(_sortedThreatList->size());`
`289`	`289`	`uint32 returnValue = 0;`
`290`	`290`	`for (ThreatReference const* ref : *_sortedThreatList)`
`291`		`- if (ref->IsAvailable() && ref->GetOwner()->GetTypeId() == TYPEID_PLAYER)`
	`291`	`+ if (ref->IsAvailable() && ref->GetVictim()->GetTypeId() == TYPEID_PLAYER)`
`292`	`292`	`++returnValue;`
`293`	`293`	`return returnValue;`
`294`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5198,7 +5198,7 @@ void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage const* log)`
`5198`	`5198`	`{`
`5199`	`5199`	`WorldPackets::CombatLog::SpellNonMeleeDamageLog packet;`
`5200`	`5200`	`packet.Me = log->target->GetGUID();`
`5201`		`- packet.CasterGUID = log->attacker->GetGUID();`
	`5201`	`+ packet.CasterGUID = Object::GetGUID(log->attacker);`
`5202`	`5202`	`packet.SpellID = log->SpellID;`
`5203`	`5203`	`packet.Damage = log->damage;`
`5204`	`5204`	`if (log->damage > log->target->GetHealth())`