apply logic to color picking as well

xGinko · Nov 14, 2023 · 1848571 · 1848571
1 parent e9c2e64
commit 1848571
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/me/xginko/pumpkinpvpreloaded/modules/effects/FireworkEffects.java b/src/main/java/me/xginko/pumpkinpvpreloaded/modules/effects/FireworkEffects.java
@@ -66,7 +66,7 @@ public FireworkEffects() {
                     int tries = 0;
                     while (secondary_color.equals(primary_color)) { // Avoid rolling the same color
                         if (tries > 100) break; // Avoid infinite loop on bad config
-                        secondary_color = parsedColors.get(new Random().nextInt(parsedColors.size()));
+                        secondary_color = parsedColors.get(new Random().nextInt(parsedColors.size() + 1) - 1);
                         tries++;
                     }
                     this.fireWorkEffects.add(FireworkEffect.builder()
@@ -100,6 +100,11 @@ public void disable() {
         HandlerList.unregisterAll(this);
     }
 
+    private FireworkEffect getRandomEffect() {
+        // Try to get a 0 naturally without having an origin value in Random (I hate using old jdk's)
+        return this.fireWorkEffects.get(new Random().nextInt(this.fireWorkEffects.size() + 1) - 1);
+    }
+
     @EventHandler(priority = EventPriority.LOWEST)
     private void onPostPumpkinExplode(PostPumpkinExplodeEvent event) {
         if (event.hasExploded()) {
@@ -125,9 +130,4 @@ private void onPostPumpkinHeadExplode(PostPumpkinHeadEntityExplodeEvent event) {
             firework.detonate();
         }
     }
-
-    private FireworkEffect getRandomEffect() {
-        // Try to get a 0 naturally without having an origin value in Random (I hate using old jdk's)
-        return this.fireWorkEffects.get(new Random().nextInt(this.fireWorkEffects.size() + 1) - 1);
-    }
 }