Merge pull request #778 from DanielNoord/fix/timers

Actually fix #772

src/InitSaveLoad/init.js

@@ -3,7 +3,6 @@ import CMDrawHook from '../Disp/DrawHook';
 import CMClickHook from '../Main/ClickHook';
 import InitializeCookieMonster from '../Main/Initialization';
 import CMLoopHook from '../Main/LoopHook';
-import CMRestHook from '../Main/ResetHook';
 import { isInitializing } from './Variables';
 
 /**
@@ -26,7 +25,7 @@ export default function init() {
     Game.registerHook('click', CMClickHook);
     Game.registerHook('draw', CMDrawHook);
     Game.registerHook('logic', CMLoopHook);
-    Game.registerHook('reset', CMRestHook);
+
     isInitializing = false; // eslint-disable-line no-unused-vars
   }
 }

src/Main/LoopHook.js

@@ -87,11 +87,12 @@ export default function CMLoopHook() {
     LoopCache();
 
     // Check all changing minigames and game-states
-    CheckGoldenCookie();
     CheckTickerFortune();
     CheckSeasonPopup();
     CheckGardenTick();
     CheckMagicMeter();
     CheckWrinklerCount();
   }
+  // To remove Timers when ascending
+  CheckGoldenCookie();
 }

src/Main/ResetHook.js

@@ -1,12 +0,0 @@
-import { GCTimers } from '../Disp/VariablesAndData';
-
-/**
- * This is called when the user ascends
- * It is called by CM.Main.Loop
- */
-export default function CMRestHook() {
-  Object.keys(GCTimers).forEach((i) => {
-    GCTimers[i].parentNode.removeChild(GCTimers[i]);
-    delete GCTimers[i];
-  });
-}