null safety, fix, version bump

Author: Mindgamesnl

.tool-versions

@@ -1 +1 @@
-java openjdk-21
+java adoptopenjdk-8.0.332+9

OpenAudioMc/.tool-versions

@@ -0,0 +1 @@
+java adoptopenjdk-8.0.332+9

OpenAudioMc/Plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/SpigotVoiceChatService.java

@@ -119,9 +119,9 @@ public void onEnable() {
 
                 // remove mods
                 manager.getCurrentProximityAdditions()
-                        .removeIf(uuid -> clientFromId(uuid).isModerating());
+                        .removeIf(this::isModeratingOrNull);
                 manager.getCurrentProximityDrops()
-                        .removeIf(uuid -> clientFromId(uuid).isModerating());
+                        .removeIf(this::isModeratingOrNull);
 
                 // handle their join messages, if any
                 if (!manager.getCurrentProximityAdditions().isEmpty()) {
@@ -230,6 +230,12 @@ private void sendMessage(Actor player, String message) {
         }
     }
 
+    private boolean isModeratingOrNull(UUID uuid) {
+        ClientConnection client = clientFromId(uuid);
+        if (client == null) return true;
+        return client.isModerating();
+    }
+
     @Getter
     @AllArgsConstructor
     private class MultiNameReference {

OpenAudioMc/Plugin/src/main/java/com/craftmend/openaudiomc/velocity/OpenAudioMcVelocity.java

@@ -36,7 +36,7 @@
 @Plugin(
         id = "openaudiomc",
         name = "OpenAudioMc Bungee Plugin Port for Velocity",
-        version = "6.10.13",
+        version = "6.10.14",
         authors = {"Mindgamesnl", "fluse1367"},
         description = "OpenAudioMc: Proximity voice chat & audio plugin for Minecraft, no mods needed. Supports Bungeecord, Velocity, Spigot & more.",
         url = "https://openaudiomc.net/"

OpenAudioMc/Plugin/src/main/resources/bungee.yml

@@ -1,5 +1,5 @@
 name: OpenAudioMc
-version: 6.10.13
+version: 6.10.14
 main: com.craftmend.openaudiomc.bungee.OpenAudioMcBungee
 author: Mindgamesnl
 authors: [Mindgamesnl]

OpenAudioMc/Plugin/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: OpenAudioMc
-version: 6.10.13
+version: 6.10.14
 softdepend: [WorldGuard, Train_Carts, LiteBans, Essentials, PlaceholderAPI]
 main: com.craftmend.openaudiomc.spigot.OpenAudioMcSpigot
 api-version: 1.13

OpenAudioMc/Plugin/src/main/resources/velocity-plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "openaudiomc",
   "name": "OpenAudioMc",
-  "version": "6.10.13",
+  "version": "6.10.14",
   "description": "OpenAudioMc: Proximity voice chat & audio plugin for Minecraft, no mods needed. Supports Bungeecord, Velocity, Spigot & more.",
   "authors": [
     "Mindgamesnl",

build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = 'com.craftmend.openaudiomc'
-    version = '6.10.13'
+    version = '6.10.14'
 
     repositories {
         mavenCentral()