fix(Index Out Of Bounds Exception): Only draw if the calculated eleme…

…nt is within the number of elements when drawing Kitt rectangles
Griefed · Jun 14, 2022 · 22b4168 · 22b4168
1 parent 37ec641
commit 22b4168
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/main/java/de/griefed/larsonscanner/LarsonScanner.java b/src/main/java/de/griefed/larsonscanner/LarsonScanner.java
@@ -2376,12 +2376,14 @@ private void drawKittRect(@NotNull Graphics2D g2d, byte startY) {
            */
           elementToDraw = (byte) (numberOfElements - (drawnElementsWidth / elementWidth) - 1);
 
-          if (useGradients) {
-            g2d.setPaint(kittRectGradient(elementToDraw, getCenter(0)));
-          } else {
-            g2d.setColor(eyeColours[elementToDraw]);
+          if (elementToDraw < numberOfElements) {
+            if (useGradients) {
+              g2d.setPaint(kittRectGradient(elementToDraw, getCenter(0)));
+            } else {
+              g2d.setColor(eyeColours[elementToDraw]);
+            }
+            g2d.fillRect(0, startY, (int) elementWidth, (int) height);
           }
-          g2d.fillRect(0, startY, (int) elementWidth, (int) height);
         }
 
       } else {
@@ -2410,12 +2412,14 @@ private void drawKittRect(@NotNull Graphics2D g2d, byte startY) {
           elementToDraw =
               (byte) (numberOfElements - ((width - drawnElementsWidth) / elementWidth) - 1);
 
-          if (useGradients) {
-            g2d.setPaint(kittRectGradient(elementToDraw, getCenter(startOfElement)));
-          } else {
-            g2d.setColor(eyeColours[elementToDraw]);
+          if (elementToDraw < numberOfElements) {
+            if (useGradients) {
+              g2d.setPaint(kittRectGradient(elementToDraw, getCenter(startOfElement)));
+            } else {
+              g2d.setColor(eyeColours[elementToDraw]);
+            }
+            g2d.fillRect((int) startOfElement, startY, (int) elementWidth, (int) height);
           }
-          g2d.fillRect((int) startOfElement, startY, (int) elementWidth, (int) height);
         }
       }
     }