stash

Author: Mindgamesnl

plugin/src/main/bash/data.bin

@@ -1 +1 @@
-BUILD_NUM="1543"
+BUILD_NUM="1546"

plugin/src/main/java/com/craftmend/openaudiomc/generic/client/session/SessionData.java

@@ -61,9 +61,11 @@ public void tick() {
     public void bumpConnectReminder() {
         boolean remindToConnect = OpenAudioMc.getInstance().getConfiguration().getBoolean(StorageKey.SETTINGS_REMIND_TO_CONNECT);
 
+        int interval = OpenAudioMc.getInstance().getConfiguration().getInt(StorageKey.SETTINGS_REMIND_TO_CONNECT_INTERVAL);
+        int secondsSinceLastPrompt = (int) Duration.between(getLastConnectPrompt(), Instant.now()).getSeconds();
+
         if (remindToConnect) {
-            int reminderInterval = OpenAudioMc.getInstance().getConfiguration().getInt(StorageKey.SETTINGS_REMIND_TO_CONNECT_INTERVAL);
-            if (!isConnected() && (Duration.between(getLastConnectPrompt(), Instant.now()).toMillis() * 1000) > reminderInterval) {
+            if (!isConnected() && secondsSinceLastPrompt > interval) {
                 client.getUser().sendMessage(Platform.translateColors(OpenAudioMc.getInstance().getConfiguration().getString(StorageKey.MESSAGE_PROMPT_TO_CONNECT)));
                 setLastConnectPrompt(Instant.now());
             }

plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/regions/objects/RegionProperties.java

@@ -30,7 +30,6 @@ public class RegionProperties extends DataStore {
     @Getter(AccessLevel.NONE)
     @Setter(AccessLevel.NONE)
     @Column private Boolean hasWorlds = false;
-
     public RegionProperties(String source, int volume, int fadeTimeMs, boolean allowsVoiceChat, String regionName, String... worldNames) {
         this.source = source;
         this.volume = volume;

plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/speakers/tasks/SpeakerGarbageCollection.java

@@ -57,7 +57,7 @@ public void run() {
         possiblyFilterLimits(setSize, this.speakerService
                 .getSpeakerMap()
                 .values().stream()
-                .filter(speaker -> speaker != null && speaker.getRequiresHealthCheck())
+                .filter(speaker -> speaker != null && speaker.getRequiresHealthCheck() != null && speaker.getRequiresHealthCheck())
                 .filter(speaker -> !speaker.getValidated())
                 .skip(fractionStart)
         ).collect(Collectors.toList())

plugin/src/main/resources/data.bin

@@ -1 +1 @@
-BUILD_NUM="1543"
+BUILD_NUM="1546"

plugin/src/main/resources/openaudiomc-build.properties

@@ -1,3 +1,3 @@
-BUILD_VERSION="1543"
-BUILD_COMMIT="0c242bd02ebbbe9412abfb4c3755497612c343a0"
+BUILD_VERSION="1546"
+BUILD_COMMIT="d358c91b36db706066c61a33e8a4d24639f2df93"
 BUILD_AUTHOR="Mats"