diff --git a/src/main/java/com/alttd/objects/ParticleSet.java b/src/main/java/com/alttd/objects/ParticleSet.java index 02ef0a5..90ec686 100644 --- a/src/main/java/com/alttd/objects/ParticleSet.java +++ b/src/main/java/com/alttd/objects/ParticleSet.java @@ -1,8 +1,11 @@ package com.alttd.objects; import com.alttd.AltitudeParticles; +import com.alttd.config.Config; import com.alttd.frameSpawners.FrameSpawnerLocation; import com.alttd.frameSpawners.FrameSpawnerPlayer; +import com.alttd.storage.PlayerSettings; +import com.alttd.util.Logger; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -12,16 +15,17 @@ import java.util.List; public class ParticleSet { private final List frames; - private final int delay, repeat; + private final int frameDelay, repeat, repeatDelay; private final APartType aPartType; private final String uniqueId; private final String permission; private final ItemStack itemStack; - public ParticleSet(List frames, int delay, int repeat, APartType aPartType, String uniqueId, String permission, ItemStack itemStack) { + public ParticleSet(List frames, int frameDelay, int repeat, int repeatDelay, APartType aPartType, String uniqueId, String permission, ItemStack itemStack) { this.frames = frames; - this.delay = delay; + this.frameDelay = frameDelay; this.repeat = repeat; + this.repeatDelay = repeatDelay; this.aPartType = aPartType; this.uniqueId = uniqueId; this.permission = permission; @@ -29,13 +33,15 @@ public class ParticleSet { } public void run(Location location) { - FrameSpawnerLocation frameSpawnerLocation = new FrameSpawnerLocation(repeat, frames, location); - frameSpawnerLocation.runTaskTimerAsynchronously(AltitudeParticles.getInstance(), 0, delay); + FrameSpawnerLocation frameSpawnerLocation = new FrameSpawnerLocation(repeat, repeatDelay, frames, location); + frameSpawnerLocation.runTaskTimerAsynchronously(AltitudeParticles.getInstance(), 0, frameDelay); } - public void run(Player player) { - FrameSpawnerPlayer frameSpawnerPlayer = new FrameSpawnerPlayer(repeat, frames, player); - frameSpawnerPlayer.runTaskTimerAsynchronously(AltitudeParticles.getInstance(), 0, delay); + public void run(Player player, PlayerSettings playerSettings) { + if (Config.DEBUG) + Logger.info("Starting particle set % for %.", uniqueId, player.getName()); + FrameSpawnerPlayer frameSpawnerPlayer = new FrameSpawnerPlayer(repeat, repeatDelay, frames, player, playerSettings, aPartType, uniqueId); + frameSpawnerPlayer.runTaskTimerAsynchronously(AltitudeParticles.getInstance(), 0, frameDelay); } public APartType getAPartType() {