From 52dacec68f2f2bd7d62e245abff5bde8d6f51a23 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sun, 12 Sep 2021 14:00:48 -0700
Subject: [PATCH] fix: Fixes overflow in timer wheel add timer (#780)

---
 Projects/Server/Timer/Timer.TimerWheel.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Projects/Server/Timer/Timer.TimerWheel.cs b/Projects/Server/Timer/Timer.TimerWheel.cs
index e1af8df8e..89c7d75bd 100644
--- a/Projects/Server/Timer/Timer.TimerWheel.cs
+++ b/Projects/Server/Timer/Timer.TimerWheel.cs
@@ -136,14 +136,17 @@ namespace Server
 
         private static void AddTimer(Timer timer, long delay)
         {
+#if DEBUG_TIMERS
+            var originalDelay = delay
+#endif
             delay = Math.Max(0, delay);
 
             var resolutionPowerOf2 = _tickRatePowerOf2;
             for (var i = 0; i < _ringLayers; i++)
             {
-                var resolution = 1 << resolutionPowerOf2;
+                var resolution = 1L << resolutionPowerOf2;
                 var nextResolutionPowerOf2 = resolutionPowerOf2 + _ringSizePowerOf2;
-                long max = 1 << nextResolutionPowerOf2;
+                var max = 1L << nextResolutionPowerOf2;
                 if (delay < max)
                 {
                     var remaining = delay & (resolution - 1);
@@ -168,13 +171,18 @@ namespace Server
 
                     _rings[i][slot] = timer;
 
-                    break;
+                    return;
                 }
 
                 // The remaining amount until we turn this ring
                 delay -= resolution * (_ringSize - _ringIndexes[i]);
                 resolutionPowerOf2 = nextResolutionPowerOf2;
             }
+
+            // TODO: Handle timers > 17yrs
+#if DEBUG_TIMERS
+            logger.Error($"Timer is more than max duration. ({originalDelay})");
+#endif
         }
 
         public static void DumpInfo(TextWriter tw)