diff options
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/CombatLogPacketsCommon.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6b2bc3dc3f3..cd94c267538 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5284,7 +5284,7 @@ void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage const* log) { WorldPackets::CombatLog::SpellNonMeleeDamageLog packet; packet.Me = log->target->GetGUID(); - packet.CasterGUID = log->attacker->GetGUID(); + packet.CasterGUID = log->attacker ? log->attacker->GetGUID() : ObjectGuid::Empty; packet.CastID = log->castId; packet.SpellID = log->Spell ? log->Spell->Id : 0; packet.Visual = log->SpellVisual; diff --git a/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp b/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp index 9bf1696e9cc..70aa879e751 100644 --- a/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp +++ b/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp @@ -117,8 +117,8 @@ bool ContentTuningParams::GenerateDataForUnits<Creature, Creature>(Creature* att template<> bool ContentTuningParams::GenerateDataForUnits<Unit, Unit>(Unit* attacker, Unit* target) { - if (Player* playerAttacker = attacker->ToPlayer()) - if (Player* playerTarget = target->ToPlayer()) + if (Player* playerAttacker = Object::ToPlayer(attacker)) + if (Player* playerTarget = Object::ToPlayer(target)) return GenerateDataForUnits(playerAttacker, playerTarget); return false; |