[General] Make ActorAttack packet consistent with PlayerAttack

Additionally, fix a typo in PlayerAttack where a boolean argument was outside of the parentheses it should have been in.

components/openmw-mp/Packets/Actor/PacketActorAttack.cpp

@@ -24,10 +24,12 @@ void PacketActorAttack::Actor(BaseActor &actor, bool send)
         RW(actor.attack.target.mpNum, send);
     }
 
+    RW(actor.attack.type, send);
+
+    if (actor.attack.type == mwmp::Attack::MELEE || actor.attack.type == mwmp::Attack::MAGIC)
+    {
         RW(actor.attack.pressed, send);
-    RW(actor.attack.instant, send);
         RW(actor.attack.success, send);
-    RW(actor.attack.type, send);
 
         if (actor.attack.type == mwmp::Attack::MELEE)
         {
@@ -39,7 +41,11 @@ void PacketActorAttack::Actor(BaseActor &actor, bool send)
             RW(actor.attack.applyProjectileEnchantment, send);
         }
         else if (actor.attack.type == mwmp::Attack::MAGIC)
+        {
+            RW(actor.attack.instant, send);
             RW(actor.attack.spellId, send, true);
+        }
+    }
     else if (actor.attack.type == mwmp::Attack::ITEM_MAGIC)
         RW(actor.attack.itemId, send, true);
 }

components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp

@@ -48,5 +48,5 @@ void PacketPlayerAttack::Packet(RakNet::BitStream *bs, bool send)
         }
     }
     else if (player->attack.type == mwmp::Attack::ITEM_MAGIC)
-        RW(player->attack.itemId, send), true;
+        RW(player->attack.itemId, send, true);
 }