From fd22ff197520c02c1fce9def70f7634f639cc32d Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 13 Sep 2018 14:16:41 +0100 Subject: [PATCH] Fix some bugs which appeared when testing --- .../src/mineplex/core/noteblock/LoopedNotePlayer.java | 11 ++++++----- .../mineplex/core/noteblock/SingleRunNotePlayer.java | 3 +-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/noteblock/LoopedNotePlayer.java b/Plugins/Mineplex.Core/src/mineplex/core/noteblock/LoopedNotePlayer.java index dc95d0be9..8894f92c7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/noteblock/LoopedNotePlayer.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/noteblock/LoopedNotePlayer.java @@ -41,7 +41,7 @@ public class LoopedNotePlayer implements Runnable, Component, Lifetimed public LoopedNotePlayer(Lifetime lifetime, NoteSong song, Predicate shouldPlay) { - this(lifetime, song, (Collection) UtilServer.getPlayersCollection(), shouldPlay); + this(lifetime, song, null, shouldPlay); } public LoopedNotePlayer(Lifetime lifetime, NoteSong song, Collection listeners) @@ -68,18 +68,19 @@ public class LoopedNotePlayer implements Runnable, Component, Lifetimed _listeners = listeners; _shouldPlay = shouldPlay; + + setPlaying(true); } @Override public void activate() { - THREAD_FACTORY.newThread(this); + THREAD_FACTORY.newThread(this).start(); } @Override public void deactivate() { - } @Override @@ -112,11 +113,11 @@ public class LoopedNotePlayer implements Runnable, Component, Lifetimed private void playTick(int tick) { - Collection listeners = _listeners; + Collection listeners = _listeners == null ? (Collection) UtilServer.getPlayersCollection() : _listeners; if (_shouldPlay != null) { - listeners = _listeners.stream() + listeners = listeners.stream() .filter(_shouldPlay) .collect(Collectors.toSet()); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/noteblock/SingleRunNotePlayer.java b/Plugins/Mineplex.Core/src/mineplex/core/noteblock/SingleRunNotePlayer.java index a0ea10c35..0154fb586 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/noteblock/SingleRunNotePlayer.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/noteblock/SingleRunNotePlayer.java @@ -6,7 +6,6 @@ import java.util.function.Predicate; import org.bukkit.entity.Player; -import mineplex.core.common.util.UtilServer; import mineplex.core.lifetimes.SimpleLifetime; public class SingleRunNotePlayer extends LoopedNotePlayer @@ -21,7 +20,7 @@ public class SingleRunNotePlayer extends LoopedNotePlayer public SingleRunNotePlayer(NoteSong song, Predicate shouldPlay) { - this(new SimpleLifetime(), song, (Collection) UtilServer.getPlayersCollection(), shouldPlay); + this(new SimpleLifetime(), song, null, shouldPlay); } public SingleRunNotePlayer(NoteSong song, Collection listeners)