Clear CreatureStorage when logging into a new character

jo3bingham · jo3bingham · commit b4a30f71a269 · 2020-03-20T15:04:28.000-04:00
Don't throw an error on invalid MessageModes.
Narrow down client version of GraphicalEffect packet change.
diff --git a/TibiaAPI/Client.cs b/TibiaAPI/Client.cs
@@ -14,6 +14,8 @@ public class Client : IDisposable
 
         public WorldMap.WorldMapStorage WorldMapStorage { get; } = new WorldMap.WorldMapStorage();
 
+        public Creatures.Creature Player { get; } = new Creatures.Creature(0, Constants.CreatureType.Player);
+
         public Network.Connection Connection { get; }
 
         public Utilities.Logger Logger { get; } = new Utilities.Logger();
diff --git a/TibiaAPI/Network/ClientPackets/Talk.cs b/TibiaAPI/Network/ClientPackets/Talk.cs
@@ -53,7 +53,8 @@ public override void ParseFromNetworkMessage(NetworkMessage message)
                     }
                     break;
                 default:
-                    throw new Exception($"Invalid MessageMode: {MessageMode}");
+                    Client.Logger.Warning($"[ClientPackets.Talk.ParseFromNetworkMessage] Invalid MessageMode: {MessageMode}");
+                    break;
             }
             Text = message.ReadString();
         }
@@ -93,7 +94,8 @@ public override void AppendToNetworkMessage(NetworkMessage message)
                     }
                     break;
                 default:
-                    throw new Exception($"Invalid MessageMode: {MessageMode}");
+                    Client.Logger.Warning($"[ClientPackets.Talk.ParseFromNetworkMessage] Invalid MessageMode: {MessageMode}");
+                    break;
             }
             message.Write(Text);
         }
diff --git a/TibiaAPI/Network/NetworkMessage.cs b/TibiaAPI/Network/NetworkMessage.cs
@@ -391,13 +391,10 @@ public Creature ReadCreatureInstance(int id = -1, Position position = null)
                         var removeCreatureId = ReadUInt32();
                         var creatureId = ReadUInt32();
 
-                        //creature = (creatureId == _client.Player.Id) ? _client.Player : new Creature(creatureId);
-                        creature = new Creature(creatureId)
-                        {
-                            Type = (CreatureType)ReadByte(),
-                            RemoveCreatureId = removeCreatureId,
-                            InstanceType = (CreatureInstanceType)id
-                        };
+                        creature = (creatureId == _client.Player.Id) ? _client.Player : new Creature(creatureId);
+                        creature.Type = (CreatureType)ReadByte();
+                        creature.RemoveCreatureId = removeCreatureId;
+                        creature.InstanceType = (CreatureInstanceType)id;
 
                         creature = _client.CreatureStorage.ReplaceCreature(creature, creature.RemoveCreatureId);
                         if (creature == null)
diff --git a/TibiaAPI/Network/ServerPackets/GraphicalEffects.cs b/TibiaAPI/Network/ServerPackets/GraphicalEffects.cs
@@ -23,7 +23,7 @@ public GraphicalEffects(Client client)
         public override void ParseFromNetworkMessage(NetworkMessage message)
         {
             Position = message.ReadPosition();
-            if (Client.VersionNumber < 12000000)
+            if (Client.VersionNumber <= 12007695)
             {
                 Effect = message.ReadByte();
             }
diff --git a/TibiaAPI/Network/ServerPackets/LoginSuccess.cs b/TibiaAPI/Network/ServerPackets/LoginSuccess.cs
@@ -10,7 +10,7 @@ public class LoginSuccess : ServerPacket
         public double SpeedB { get; set; }
         public double SpeedC { get; set; }
 
-        public int PlayerId { get; set; }
+        public uint PlayerId { get; set; }
 
         public ushort BeatDuration { get; set; }
 
@@ -31,7 +31,12 @@ public LoginSuccess(Client client)
 
         public override void ParseFromNetworkMessage(NetworkMessage message)
         {
-            PlayerId = message.ReadInt32();
+            PlayerId = message.ReadUInt32();
+            if (Client.Player.Id != PlayerId)
+            {
+                Client.CreatureStorage.Reset();
+            }
+            Client.Player.Id = PlayerId;
             BeatDuration = message.ReadUInt16();
             SpeedA = message.ReadDouble();
             SpeedB = message.ReadDouble();
diff --git a/TibiaAPI/Network/ServerPackets/Message.cs b/TibiaAPI/Network/ServerPackets/Message.cs
@@ -78,7 +78,8 @@ public override void ParseFromNetworkMessage(NetworkMessage message)
                 case MessageModeType.OfflineTraining:
                     break;
                 default:
-                    throw new Exception($"Invalid MessageMode: {MessageMode}");
+                    Client.Logger.Warning($"[ServerPackets.Message.ParseFromNetworkMessage] Invalid MessageMode: {MessageMode}");
+                    break;
             }
             Text = message.ReadString();
         }
@@ -134,7 +135,8 @@ public override void AppendToNetworkMessage(NetworkMessage message)
                 case MessageModeType.BoostedCreature:
                     break;
                 default:
-                    throw new Exception($"Invalid MessageMode: {MessageMode}");
+                    Client.Logger.Warning($"[ServerPackets.Message.AppendToNetworkMessage] Invalid MessageMode: {MessageMode}");
+                    break;
             }
             message.Write(Text);
         }
diff --git a/TibiaAPI/Network/ServerPackets/WorldEntered.cs b/TibiaAPI/Network/ServerPackets/WorldEntered.cs
@@ -14,14 +14,6 @@ public override void ParseFromNetworkMessage(NetworkMessage message)
         {
             if (Client.Connection.ConnectionState == ConnectionState.Pending)
             {
-                // I've experienced intermittent instances where the server
-                // will resend the whole login process (WorldEntered, FullMap, etc.)
-                // after it has already done so, and the creatures in the FullMap
-                // packet are tagged as outdated. Because of the following WorldEntered
-                // packet, this will reset the creature storage and the parser will be
-                // unable to find any existing creatures because they've been cleared.
-                // Just commenting out the code and leaving this comment as a reminder.
-                //Client.CreatureStorage.Reset();
                 Client.WorldMapStorage.ResetMap();
                 Client.WorldMapStorage.SetPosition(0, 0, 0);
             }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ public override void ParseFromNetworkMessage(NetworkMessage message)`
`53`	`53`	`}`
`54`	`54`	`break;`
`55`	`55`	`default:`
`56`		`- throw new Exception($"Invalid MessageMode: {MessageMode}");`
	`56`	`+ Client.Logger.Warning($"[ClientPackets.Talk.ParseFromNetworkMessage] Invalid MessageMode: {MessageMode}");`
	`57`	`+ break;`
`57`	`58`	`}`
`58`	`59`	`Text = message.ReadString();`
`59`	`60`	`}`
`@@ -93,7 +94,8 @@ public override void AppendToNetworkMessage(NetworkMessage message)`
`93`	`94`	`}`
`94`	`95`	`break;`
`95`	`96`	`default:`
`96`		`- throw new Exception($"Invalid MessageMode: {MessageMode}");`
	`97`	`+ Client.Logger.Warning($"[ClientPackets.Talk.ParseFromNetworkMessage] Invalid MessageMode: {MessageMode}");`
	`98`	`+ break;`
`97`	`99`	`}`
`98`	`100`	`message.Write(Text);`
`99`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public GraphicalEffects(Client client)`
`23`	`23`	`public override void ParseFromNetworkMessage(NetworkMessage message)`
`24`	`24`	`{`
`25`	`25`	`Position = message.ReadPosition();`
`26`		`- if (Client.VersionNumber < 12000000)`
	`26`	`+ if (Client.VersionNumber <= 12007695)`
`27`	`27`	`{`
`28`	`28`	`Effect = message.ReadByte();`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ public override void ParseFromNetworkMessage(NetworkMessage message)`
`78`	`78`	`case MessageModeType.OfflineTraining:`
`79`	`79`	`break;`
`80`	`80`	`default:`
`81`		`- throw new Exception($"Invalid MessageMode: {MessageMode}");`
	`81`	`+ Client.Logger.Warning($"[ServerPackets.Message.ParseFromNetworkMessage] Invalid MessageMode: {MessageMode}");`
	`82`	`+ break;`
`82`	`83`	`}`
`83`	`84`	`Text = message.ReadString();`
`84`	`85`	`}`
`@@ -134,7 +135,8 @@ public override void AppendToNetworkMessage(NetworkMessage message)`
`134`	`135`	`case MessageModeType.BoostedCreature:`
`135`	`136`	`break;`
`136`	`137`	`default:`
`137`		`- throw new Exception($"Invalid MessageMode: {MessageMode}");`
	`138`	`+ Client.Logger.Warning($"[ServerPackets.Message.AppendToNetworkMessage] Invalid MessageMode: {MessageMode}");`
	`139`	`+ break;`
`138`	`140`	`}`
`139`	`141`	`message.Write(Text);`
`140`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,6 @@ public override void ParseFromNetworkMessage(NetworkMessage message)`
`14`	`14`	`{`
`15`	`15`	`if (Client.Connection.ConnectionState == ConnectionState.Pending)`
`16`	`16`	`{`
`17`		`- // I've experienced intermittent instances where the server`
`18`		`- // will resend the whole login process (WorldEntered, FullMap, etc.)`
`19`		`- // after it has already done so, and the creatures in the FullMap`
`20`		`- // packet are tagged as outdated. Because of the following WorldEntered`
`21`		`- // packet, this will reset the creature storage and the parser will be`
`22`		`- // unable to find any existing creatures because they've been cleared.`
`23`		`- // Just commenting out the code and leaving this comment as a reminder.`
`24`		`- //Client.CreatureStorage.Reset();`
`25`	`17`	`Client.WorldMapStorage.ResetMap();`
`26`	`18`	`Client.WorldMapStorage.SetPosition(0, 0, 0);`
`27`	`19`	`}`