Add unknown changes to GraphicalEffects packet

jo3bingham · jo3bingham · commit f4f0fef14921 · 2018-12-18T13:58:24.000Z
Update Extract app to handle truncated recording
diff --git a/Apps/Extract/Program.cs b/Apps/Extract/Program.cs
@@ -245,15 +245,18 @@ static void Main(string[] args)
                             };
 
                             reader.BaseStream.Position -= 8;
-                            Array.Copy(reader.ReadBytes((int)message.Size), message.GetBuffer(), message.Size);
-
-                            if (packetType == PacketType.Server)
-                            {
-                                client.Proxy.ParseServerMessage(client, message, outMessage);
-                            }
-                            else
+                            if ((reader.BaseStream.Length - reader.BaseStream.Position) >= message.Size)
                             {
-                                client.Proxy.ParseClientMessage(client, message, outMessage);
+                                Array.Copy(reader.ReadBytes((int)message.Size), message.GetBuffer(), message.Size);
+
+                                if (packetType == PacketType.Server)
+                                {
+                                    client.Proxy.ParseServerMessage(client, message, outMessage);
+                                }
+                                else
+                                {
+                                    client.Proxy.ParseClientMessage(client, message, outMessage);
+                                }
                             }
                         }
 
diff --git a/TibiaAPI/Constants/Enums.cs b/TibiaAPI/Constants/Enums.cs
@@ -428,7 +428,7 @@ public enum ServerPacketType
         CounterOffer = 0x7E,
         CloseTrade = 0x7F,
         Ambiente = 0x82,
-        GraphicalEffect = 0x83,
+        GraphicalEffects = 0x83,
         RemoveGraphicalEffect = 0x84,
         MissileEffect = 0x85,
         Trappers = 0x87,
diff --git a/TibiaAPI/Network/Communication.cs b/TibiaAPI/Network/Communication.cs
@@ -175,7 +175,7 @@ public class Communication
         public event ReceivedPacketEventHandler OnReceivedServerCounterOfferPacket;
         public event ReceivedPacketEventHandler OnReceivedServerCloseTradePacket;
         public event ReceivedPacketEventHandler OnReceivedServerAmbientePacket;
-        public event ReceivedPacketEventHandler OnReceivedServerGraphicalEffectPacket;
+        public event ReceivedPacketEventHandler OnReceivedServerGraphicalEffectsPacket;
         public event ReceivedPacketEventHandler OnReceivedServerRemoveGraphicalEffectPacket;
         public event ReceivedPacketEventHandler OnReceivedServerMissileEffectPacket;
         public event ReceivedPacketEventHandler OnReceivedServerTrappersPacket;
@@ -2481,12 +2481,12 @@ public void ParseServerMessage(Client client, NetworkMessage inMessage, NetworkM
                                 }
                             }
                             break;
-                        case ServerPacketType.GraphicalEffect:
+                        case ServerPacketType.GraphicalEffects:
                             {
-                                var packet = new ServerPackets.GraphicalEffect(client);
+                                var packet = new ServerPackets.GraphicalEffects(client);
                                 if (packet.ParseFromNetworkMessage(inMessage))
                                 {
-                                    packet.Forward = OnReceivedServerGraphicalEffectPacket?.Invoke(packet) ?? true;
+                                    packet.Forward = OnReceivedServerGraphicalEffectsPacket?.Invoke(packet) ?? true;
                                     if (packet.Forward)
                                     {
                                         packet.AppendToNetworkMessage(outMessage);
diff --git a/TibiaAPI/Network/ServerPackets/GraphicalEffects.cs b/TibiaAPI/Network/ServerPackets/GraphicalEffects.cs
@@ -3,35 +3,39 @@
 
 namespace OXGaming.TibiaAPI.Network.ServerPackets
 {
-    public class GraphicalEffect : ServerPacket
+    public class GraphicalEffects : ServerPacket
     {
         public Position Position { get; set; }
 
+        public uint Unknown { get; set; }
+
         public byte Effect { get; set; }
 
-        public GraphicalEffect(Client client)
+        public GraphicalEffects(Client client)
         {
             Client = client;
-            PacketType = ServerPacketType.GraphicalEffect;
+            PacketType = ServerPacketType.GraphicalEffects;
         }
 
         public override bool ParseFromNetworkMessage(NetworkMessage message)
         {
-            if (message.ReadByte() != (byte)ServerPacketType.GraphicalEffect)
+            if (message.ReadByte() != (byte)ServerPacketType.GraphicalEffects)
             {
                 return false;
             }
 
             Position = message.ReadPosition();
             Effect = message.ReadByte();
+            Unknown = message.ReadUInt32();
             return true;
         }
 
         public override void AppendToNetworkMessage(NetworkMessage message)
         {
-            message.Write((byte)ServerPacketType.GraphicalEffect);
+            message.Write((byte)ServerPacketType.GraphicalEffects);
             message.Write(Position);
             message.Write(Effect);
+            message.Write(Unknown);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public class Communication`
`175`	`175`	`public event ReceivedPacketEventHandler OnReceivedServerCounterOfferPacket;`
`176`	`176`	`public event ReceivedPacketEventHandler OnReceivedServerCloseTradePacket;`
`177`	`177`	`public event ReceivedPacketEventHandler OnReceivedServerAmbientePacket;`
`178`		`- public event ReceivedPacketEventHandler OnReceivedServerGraphicalEffectPacket;`
	`178`	`+ public event ReceivedPacketEventHandler OnReceivedServerGraphicalEffectsPacket;`
`179`	`179`	`public event ReceivedPacketEventHandler OnReceivedServerRemoveGraphicalEffectPacket;`
`180`	`180`	`public event ReceivedPacketEventHandler OnReceivedServerMissileEffectPacket;`
`181`	`181`	`public event ReceivedPacketEventHandler OnReceivedServerTrappersPacket;`
`@@ -2481,12 +2481,12 @@ public void ParseServerMessage(Client client, NetworkMessage inMessage, NetworkM`
`2481`	`2481`	`}`
`2482`	`2482`	`}`
`2483`	`2483`	`break;`
`2484`		`- case ServerPacketType.GraphicalEffect:`
	`2484`	`+ case ServerPacketType.GraphicalEffects:`
`2485`	`2485`	`{`
`2486`		`- var packet = new ServerPackets.GraphicalEffect(client);`
	`2486`	`+ var packet = new ServerPackets.GraphicalEffects(client);`
`2487`	`2487`	`if (packet.ParseFromNetworkMessage(inMessage))`
`2488`	`2488`	`{`
`2489`		`- packet.Forward = OnReceivedServerGraphicalEffectPacket?.Invoke(packet) ?? true;`
	`2489`	`+ packet.Forward = OnReceivedServerGraphicalEffectsPacket?.Invoke(packet) ?? true;`
`2490`	`2490`	`if (packet.Forward)`
`2491`	`2491`	`{`
`2492`	`2492`	`packet.AppendToNetworkMessage(outMessage);`
Original file line number	Diff line number	Diff line change
`@@ -3,35 +3,39 @@`
`3`	`3`
`4`	`4`	`namespace OXGaming.TibiaAPI.Network.ServerPackets`
`5`	`5`	`{`
`6`		`- public class GraphicalEffect : ServerPacket`
	`6`	`+ public class GraphicalEffects : ServerPacket`
`7`	`7`	`{`
`8`	`8`	`public Position Position { get; set; }`
`9`	`9`
	`10`	`+ public uint Unknown { get; set; }`
	`11`	`+`
`10`	`12`	`public byte Effect { get; set; }`
`11`	`13`
`12`		`- public GraphicalEffect(Client client)`
	`14`	`+ public GraphicalEffects(Client client)`
`13`	`15`	`{`
`14`	`16`	`Client = client;`
`15`		`- PacketType = ServerPacketType.GraphicalEffect;`
	`17`	`+ PacketType = ServerPacketType.GraphicalEffects;`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`public override bool ParseFromNetworkMessage(NetworkMessage message)`
`19`	`21`	`{`
`20`		`- if (message.ReadByte() != (byte)ServerPacketType.GraphicalEffect)`
	`22`	`+ if (message.ReadByte() != (byte)ServerPacketType.GraphicalEffects)`
`21`	`23`	`{`
`22`	`24`	`return false;`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`Position = message.ReadPosition();`
`26`	`28`	`Effect = message.ReadByte();`
	`29`	`+ Unknown = message.ReadUInt32();`
`27`	`30`	`return true;`
`28`	`31`	`}`
`29`	`32`
`30`	`33`	`public override void AppendToNetworkMessage(NetworkMessage message)`
`31`	`34`	`{`
`32`		`- message.Write((byte)ServerPacketType.GraphicalEffect);`
	`35`	`+ message.Write((byte)ServerPacketType.GraphicalEffects);`
`33`	`36`	`message.Write(Position);`
`34`	`37`	`message.Write(Effect);`
	`38`	`+ message.Write(Unknown);`
`35`	`39`	`}`
`36`	`40`	`}`
`37`	`41`	`}`