diff --git a/.tool-versions b/.tool-versions index 8ad369382..bb5e99345 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -java openjdk-17 +java openjdk-21 diff --git a/plugin/src/main/bash/data.bin b/plugin/src/main/bash/data.bin index 000bea788..3292e4462 100755 --- a/plugin/src/main/bash/data.bin +++ b/plugin/src/main/bash/data.bin @@ -1 +1 @@ -BUILD_NUM="1456" \ No newline at end of file +BUILD_NUM="1458" diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/SpigotVoiceChatService.java b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/SpigotVoiceChatService.java index c539acbfb..92eaea357 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/SpigotVoiceChatService.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/SpigotVoiceChatService.java @@ -110,6 +110,13 @@ public void onEnable() { // go over every player and handle their message queue for (ClientConnection client : networkingService.getClients()) { RtcSessionManager manager = client.getRtcSessionManager(); + + // remove mods + manager.getCurrentProximityAdditions() + .removeIf(uuid -> clientFromId(uuid).isModerating()); + manager.getCurrentProximityDrops() + .removeIf(uuid -> clientFromId(uuid).isModerating()); + // handle their join messages, if any if (!manager.getCurrentProximityAdditions().isEmpty()) { // do these diff --git a/plugin/src/main/resources/data.bin b/plugin/src/main/resources/data.bin index 000bea788..3292e4462 100755 --- a/plugin/src/main/resources/data.bin +++ b/plugin/src/main/resources/data.bin @@ -1 +1 @@ -BUILD_NUM="1456" \ No newline at end of file +BUILD_NUM="1458" diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties index b20305582..00a7ad0c1 100644 --- a/plugin/src/main/resources/openaudiomc-build.properties +++ b/plugin/src/main/resources/openaudiomc-build.properties @@ -1,3 +1,3 @@ -BUILD_VERSION="1456" -BUILD_COMMIT="586163790a59cb378cdfe4701acca55f9edfd64c" -BUILD_AUTHOR="Mats" \ No newline at end of file +BUILD_VERSION="1458" +BUILD_COMMIT="461fcc4bfc82654a0863e0b2fbd68555673c3bb1" +BUILD_AUTHOR="Mats"