From 4141c939d6be7037ea1e5a8ae12dd06491da08e3 Mon Sep 17 00:00:00 2001
From: EmeraldBlock <69981203+EmeraldBlock@users.noreply.github.com>
Date: Thu, 8 Oct 2020 20:12:34 -0500
Subject: [PATCH] use safeModulo

---
 src/js/game/hud/parts/base_toolbar.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/js/game/hud/parts/base_toolbar.js b/src/js/game/hud/parts/base_toolbar.js
index 3db6dfcb..391c3558 100644
--- a/src/js/game/hud/parts/base_toolbar.js
+++ b/src/js/game/hud/parts/base_toolbar.js
@@ -164,11 +164,8 @@ export class HUDBaseToolbar extends BaseHUDPart {
             ? -1
             : 1;
         let newIndex = this.lastSelectedIndex;
-        for (let i = 0; i < this.primaryBuildings.length; ++i, newIndex += direction) {
-            newIndex %= this.primaryBuildings.length;
-            if (newIndex < 0) {
-                newIndex += this.primaryBuildings.length;
-            }
+        for (let i = 0; i < this.primaryBuildings.length; ++i) {
+            newIndex = safeModulo(newIndex + direction, this.primaryBuildings.length);
             const metaBuilding = gMetaBuildingRegistry.findByClass(this.primaryBuildings[newIndex]);
             const handle = this.buildingHandles[metaBuilding.id];
             if (!handle.selected && handle.unlocked) {