From b1bdfbcb999d31245d69b707886501bcb4a3be3d Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Sun, 5 Jun 2022 05:27:46 +0200
Subject: [PATCH] Fixed bugs added stuff

---
 src/main/java/com/alttd/config/ParticleConfig.java             | 1 +
 .../java/com/alttd/frameSpawners/FrameSpawnerLocation.java     | 3 ++-
 src/main/java/com/alttd/frameSpawners/FrameSpawnerPlayer.java  | 2 +-
 src/main/java/com/alttd/objects/APartType.java                 | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/alttd/config/ParticleConfig.java b/src/main/java/com/alttd/config/ParticleConfig.java
index edc8015..88e9879 100644
--- a/src/main/java/com/alttd/config/ParticleConfig.java
+++ b/src/main/java/com/alttd/config/ParticleConfig.java
@@ -97,6 +97,7 @@ public class ParticleConfig extends AbstractConfig {
         cs.getString("particle");
         ConfigurationSection color = cs.getConfigurationSection("color");
         ParticleBuilder particle = new ParticleBuilder(Particle.valueOf(cs.getString("particle")));
+        particle.extra(cs.getDouble("extra"));
         if (color != null) {
             particle = particle.color(color.getInt("r"), color.getInt("g"), color.getInt("b"));
         }
diff --git a/src/main/java/com/alttd/frameSpawners/FrameSpawnerLocation.java b/src/main/java/com/alttd/frameSpawners/FrameSpawnerLocation.java
index 093b284..187c10f 100644
--- a/src/main/java/com/alttd/frameSpawners/FrameSpawnerLocation.java
+++ b/src/main/java/com/alttd/frameSpawners/FrameSpawnerLocation.java
@@ -32,7 +32,8 @@ public class FrameSpawnerLocation extends BukkitRunnable {
             iterator.next().spawn(location, rotation);
         else if (amount != 0) {
             iterator = frames.iterator();
-            amount--;
+            if (amount > 0)
+                amount--;
             if (repeatDelay <= 0)
                 return;
             try { //Wait before repeating the frames
diff --git a/src/main/java/com/alttd/frameSpawners/FrameSpawnerPlayer.java b/src/main/java/com/alttd/frameSpawners/FrameSpawnerPlayer.java
index 647a1a8..49bca5d 100644
--- a/src/main/java/com/alttd/frameSpawners/FrameSpawnerPlayer.java
+++ b/src/main/java/com/alttd/frameSpawners/FrameSpawnerPlayer.java
@@ -42,7 +42,7 @@ public class FrameSpawnerPlayer extends BukkitRunnable {
             return;
         }
         ParticleSet activeParticleSet = playerSettings.getParticles(aPartType);
-        if (activeParticleSet == null || !activeParticleSet.getParticleId().equalsIgnoreCase(uniqueId) || playerSettings.hasActiveParticles()) {
+        if (activeParticleSet == null || !activeParticleSet.getParticleId().equalsIgnoreCase(uniqueId) || !playerSettings.hasActiveParticles()) {
             this.cancel();
             if (Config.DEBUG)
                 Logger.info("Stopped repeating task due to player switching/disabling particles.");
diff --git a/src/main/java/com/alttd/objects/APartType.java b/src/main/java/com/alttd/objects/APartType.java
index 32a284b..7798c7a 100644
--- a/src/main/java/com/alttd/objects/APartType.java
+++ b/src/main/java/com/alttd/objects/APartType.java
@@ -3,8 +3,6 @@ package com.alttd.objects;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.Arrays;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 public enum APartType { //TODO add description?