Fix integer overflow errors for values that can get very large

ethanmoffat · May 1, 2023 · deac6f3 · deac6f3
1 parent 0ad9e22
commit deac6f3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/EOLib.Config.Test/ConfigFileLoadActionsTest.cs b/EOLib.Config.Test/ConfigFileLoadActionsTest.cs
@@ -56,9 +56,6 @@ public void InvalidConfigFileThatExists_UsesConfigurationValueDefaults()
             Assert.IsTrue(_configurationRepository.ShowChatBubbles);
             Assert.IsFalse(_configurationRepository.ShowTransition);
 
-            Assert.AreEqual(ConfigDefaults.InGameWidth, _configurationRepository.InGameWidth);
-            Assert.AreEqual(ConfigDefaults.InGameHeight, _configurationRepository.InGameHeight);
-
             Assert.IsFalse(_configurationRepository.MusicEnabled);
             Assert.IsFalse(_configurationRepository.SoundEnabled);
 

diff --git a/EOLib/Domain/Character/CharacterSessionRepository.cs b/EOLib/Domain/Character/CharacterSessionRepository.cs
@@ -11,7 +11,7 @@ public interface ICharacterSessionRepository : IResettable
 
         int LastKillExp { get; set; }
 
-        int TodayTotalExp { get; set; }
+        ulong TodayTotalExp { get; set; }
     }
 
     public interface ICharacterSessionProvider : IResettable
@@ -22,7 +22,7 @@ public interface ICharacterSessionProvider : IResettable
 
         int LastKillExp { get; }
 
-        int TodayTotalExp { get; }
+        ulong TodayTotalExp { get; }
     }
 
     [AutoMappedType(IsSingleton = true)]
@@ -34,7 +34,7 @@ public class CharacterSessionRepository : ICharacterSessionRepository, ICharacte
 
         public int LastKillExp { get; set; }
 
-        public int TodayTotalExp { get; set; }
+        public ulong TodayTotalExp { get; set; }
 
         public CharacterSessionRepository()
         {

diff --git a/EOLib/PacketHandlers/NPC/NPCSpecHandler.cs b/EOLib/PacketHandlers/NPC/NPCSpecHandler.cs
@@ -92,7 +92,7 @@ public override bool HandlePacket(IPacket packet)
                 _characterSessionRepository.LastKillExp = expDifference;
                 if (expDifference > _characterSessionRepository.BestKillExp)
                     _characterSessionRepository.BestKillExp = expDifference;
-                _characterSessionRepository.TodayTotalExp += expDifference;
+                _characterSessionRepository.TodayTotalExp += Convert.ToUInt64(Math.Max(expDifference, 0));
             }
 
             if (droppedItemID > 0)