From 6597d31d35951c9ad09a60b84c370c3b782c1df9 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Sun, 14 Jan 2018 16:00:13 -0500
Subject: [PATCH] Core/PacketIO: Fixed SMSG_SPELL_NON_MELEE_DAMAGE_LOG struct

---
 Source/Game/Entities/Unit/Unit.Spells.cs        | 6 +++---
 Source/Game/Network/Packets/CombatLogPackets.cs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/Game/Entities/Unit/Unit.Spells.cs b/Source/Game/Entities/Unit/Unit.Spells.cs
index 853b89236..51becc31e 100644
--- a/Source/Game/Entities/Unit/Unit.Spells.cs
+++ b/Source/Game/Entities/Unit/Unit.Spells.cs
@@ -2512,12 +2512,12 @@ namespace Game.Entities
             if (log.damage > log.preHitHealth)
                 packet.Overkill = (int)(log.damage - log.preHitHealth);
             else
-                packet.Overkill = 0;
+                packet.Overkill = -1;
 
             packet.SchoolMask = (byte)log.schoolMask;
-            packet.ShieldBlock = (int)log.blocked;
-            packet.Resisted = (int)log.resist;
             packet.Absorbed = (int)log.absorb;
+            packet.Resisted = (int)log.resist;
+            packet.ShieldBlock = (int)log.blocked;
             packet.Periodic = log.periodicLog;
             packet.Flags = (int)log.HitInfo;
 
diff --git a/Source/Game/Network/Packets/CombatLogPackets.cs b/Source/Game/Network/Packets/CombatLogPackets.cs
index 8e16ad29d..9bf26922a 100644
--- a/Source/Game/Network/Packets/CombatLogPackets.cs
+++ b/Source/Game/Network/Packets/CombatLogPackets.cs
@@ -70,9 +70,9 @@ namespace Game.Network.Packets
             _worldPacket.WriteInt32(Damage);
             _worldPacket.WriteInt32(Overkill);
             _worldPacket.WriteUInt8(SchoolMask);
-            _worldPacket.WriteInt32(ShieldBlock);
-            _worldPacket.WriteInt32(Resisted);
             _worldPacket.WriteInt32(Absorbed);
+            _worldPacket.WriteInt32(Resisted);
+            _worldPacket.WriteInt32(ShieldBlock);
 
             _worldPacket.WriteBit(Periodic);
             _worldPacket.WriteBits(Flags, 7);
@@ -91,7 +91,7 @@ namespace Game.Network.Packets
         public int SpellID;
         public int SpellXSpellVisualID;
         public int Damage;
-        public int Overkill;
+        public int Overkill = -1;
         public byte SchoolMask;
         public int ShieldBlock;
         public int Resisted;