From f3ea56f34db9975a654f38c58f346085896a2d2c Mon Sep 17 00:00:00 2001 From: Daniel van Noord Date: Fri, 4 Dec 2020 22:50:41 +0100 Subject: [PATCH] Hotfix v3 #405 --- CookieMonster.js | 8 +++++--- src/Disp.js | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 17dabe9..0e38cb5 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -1875,9 +1875,7 @@ CM.Disp.CheckGoldenCookie = function() { CM.Disp.PlaySound(CM.Config.GCSoundURL, 'GCSound', 'GCVolume'); CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!") } - CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState - if (CM.Disp.currSpawnedGoldenCookieState == 0) CM.Disp.spawnedGoldenShimmer = 0; - CM.Disp.UpdateFavicon(); + if (CM.Config.GCTimer == 1) { for (var i in Game.shimmers) { @@ -1892,6 +1890,10 @@ CM.Disp.CheckGoldenCookie = function() { CM.Disp.GCTimers[i].style.display = 'none'; } } + CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState + if (CM.Disp.currSpawnedGoldenCookieState == 0) CM.Disp.spawnedGoldenShimmer = 0; + CM.Disp.UpdateFavicon(); + } else if (CM.Config.GCTimer == 1 && CM.Disp.lastGoldenCookieState) { for (var i in CM.Disp.GCTimers) { diff --git a/src/Disp.js b/src/Disp.js index 49faa74..6ac94aa 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -1033,9 +1033,7 @@ CM.Disp.CheckGoldenCookie = function() { CM.Disp.PlaySound(CM.Config.GCSoundURL, 'GCSound', 'GCVolume'); CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!") } - CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState - if (CM.Disp.currSpawnedGoldenCookieState == 0) CM.Disp.spawnedGoldenShimmer = 0; - CM.Disp.UpdateFavicon(); + if (CM.Config.GCTimer == 1) { for (var i in Game.shimmers) { @@ -1050,6 +1048,10 @@ CM.Disp.CheckGoldenCookie = function() { CM.Disp.GCTimers[i].style.display = 'none'; } } + CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState + if (CM.Disp.currSpawnedGoldenCookieState == 0) CM.Disp.spawnedGoldenShimmer = 0; + CM.Disp.UpdateFavicon(); + } else if (CM.Config.GCTimer == 1 && CM.Disp.lastGoldenCookieState) { for (var i in CM.Disp.GCTimers) {