Fix issue when appending CreatureOutfit packet to message

jo3bingham · jo3bingham · commit 751200077484 · 2018-12-19T16:17:24.000Z
diff --git a/TibiaAPI/Network/NetworkMessage.cs b/TibiaAPI/Network/NetworkMessage.cs
@@ -860,11 +860,18 @@ public void Write(Position value)
         public void Write(OutfitInstance value)
         {
             Write((ushort)value.Id);
-            Write(value.ColorHead);
-            Write(value.ColorTorso);
-            Write(value.ColorLegs);
-            Write(value.ColorDetail);
-            Write(value.Addons);
+            if (value.Id == 0)
+            {
+                Write((ushort)0);
+            }
+            else
+            {
+                Write(value.ColorHead);
+                Write(value.ColorTorso);
+                Write(value.ColorLegs);
+                Write(value.ColorDetail);
+                Write(value.Addons);
+            }
         }
 
         public void Write(ObjectInstance value)
diff --git a/TibiaAPI/Network/ServerPackets/CreatureOutfit.cs b/TibiaAPI/Network/ServerPackets/CreatureOutfit.cs
@@ -5,8 +5,8 @@ namespace OXGaming.TibiaAPI.Network.ServerPackets
 {
     public class CreatureOutfit : ServerPacket
     {
-        AppearanceInstance Mount { get; set; }
-        AppearanceInstance Outfit { get; set; }
+        public AppearanceInstance Mount { get; set; }
+        public AppearanceInstance Outfit { get; set; }
 
         public uint CreatureId { get; set; }
 
@@ -33,16 +33,16 @@ public override void AppendToNetworkMessage(NetworkMessage message)
         {
             message.Write((byte)ServerPacketType.CreatureOutfit);
             message.Write(CreatureId);
-            message.Write(Mount.Id);
             if (Outfit is OutfitInstance)
             {
                 message.Write((OutfitInstance)Outfit);
             }
             else if (Outfit is ObjectInstance)
             {
                 message.Write((ushort)0);
-                message.Write(Outfit.Id);
+                message.Write((ushort)Outfit.Id);
             }
+            message.Write((ushort)Mount.Id);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ namespace OXGaming.TibiaAPI.Network.ServerPackets`
`5`	`5`	`{`
`6`	`6`	`public class CreatureOutfit : ServerPacket`
`7`	`7`	`{`
`8`		`- AppearanceInstance Mount { get; set; }`
`9`		`- AppearanceInstance Outfit { get; set; }`
	`8`	`+ public AppearanceInstance Mount { get; set; }`
	`9`	`+ public AppearanceInstance Outfit { get; set; }`
`10`	`10`
`11`	`11`	`public uint CreatureId { get; set; }`
`12`	`12`
`@@ -33,16 +33,16 @@ public override void AppendToNetworkMessage(NetworkMessage message)`
`33`	`33`	`{`
`34`	`34`	`message.Write((byte)ServerPacketType.CreatureOutfit);`
`35`	`35`	`message.Write(CreatureId);`
`36`		`- message.Write(Mount.Id);`
`37`	`36`	`if (Outfit is OutfitInstance)`
`38`	`37`	`{`
`39`	`38`	`message.Write((OutfitInstance)Outfit);`
`40`	`39`	`}`
`41`	`40`	`else if (Outfit is ObjectInstance)`
`42`	`41`	`{`
`43`	`42`	`message.Write((ushort)0);`
`44`		`- message.Write(Outfit.Id);`
	`43`	`+ message.Write((ushort)Outfit.Id);`
`45`	`44`	`}`
	`45`	`+ message.Write((ushort)Mount.Id);`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`