Core/PacketIO: Fixed SMSG_SPELL_NON_MELEE_DAMAGE_LOG struct

3 files changed, 6 insertions, 6 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 454673bf886..c4c47317f25 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -5043,12 +5043,12 @@ void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage const* log)
     if (log->damage > log->preHitHealth)
         packet.Overkill = log->damage - log->preHitHealth;
     else
-        packet.Overkill = 0;
+        packet.Overkill = -1;
 
     packet.SchoolMask = log->schoolMask;
-    packet.ShieldBlock = log->blocked;
-    packet.Resisted = log->resist;
     packet.Absorbed = log->absorb;
+    packet.Resisted = log->resist;
+    packet.ShieldBlock = log->blocked;
     packet.Periodic = log->periodicLog;
     packet.Flags = log->HitInfo;
 
diff --git a/src/server/game/Server/Packets/CombatLogPackets.cpp b/src/server/game/Server/Packets/CombatLogPackets.cpp
index 981ceefdfbf..22196336960 100644
--- a/src/server/game/Server/Packets/CombatLogPackets.cpp
+++ b/src/server/game/Server/Packets/CombatLogPackets.cpp
@@ -28,9 +28,9 @@ WorldPacket const* WorldPackets::CombatLog::SpellNonMeleeDamageLog::Write()
     *this << int32(Damage);
     *this << int32(Overkill);
     *this << uint8(SchoolMask);
-    *this << int32(ShieldBlock);
-    *this << int32(Resisted);
     *this << int32(Absorbed);
+    *this << int32(Resisted);
+    *this << int32(ShieldBlock);
     WriteBit(Periodic);
     WriteBits(Flags, 7);
     WriteBit(false); // Debug info
diff --git a/src/server/game/Server/Packets/CombatLogPackets.h b/src/server/game/Server/Packets/CombatLogPackets.h
index 8d1e5062396..88a427ac962 100644
--- a/src/server/game/Server/Packets/CombatLogPackets.h
+++ b/src/server/game/Server/Packets/CombatLogPackets.h
@@ -39,7 +39,7 @@ namespace WorldPackets
             int32 SpellID = 0;
             int32 SpellXSpellVisualID = 0;
             int32 Damage = 0;
-            int32 Overkill = 0;
+            int32 Overkill = -1;
             uint8 SchoolMask = 0;
             int32 ShieldBlock = 0;
             int32 Resisted = 0;