From 0268eff4fc55ffacd925fef4b77d790d24d8e424 Mon Sep 17 00:00:00 2001 From: Mats Date: Thu, 18 Jan 2024 19:43:03 +0100 Subject: [PATCH 1/3] Migrate some filter modules to embedded features --- .../gamemode-voice-filter-module/.gitignore | 5 - modules/gamemode-voice-filter-module/pom.xml | 139 ---------------- .../gamemodefilter/OaGamemodeFilter.java | 46 ------ .../src/main/resources/type.info | 1 - .../survival-audio-rules-module/.gitignore | 5 - modules/survival-audio-rules-module/README.md | 7 - modules/survival-audio-rules-module/pom.xml | 150 ------------------ .../rules/survival/OaSurvivalRules.java | 29 ---- .../src/main/resources/type.info | 1 - .../generic/migrations/MigrationWorker.java | 1 + .../generic/storage/enums/StorageKey.java | 2 + .../voicechat/SpigotVoiceChatService.java | 9 ++ .../filters/impl/GamemodeFilter.java | 11 ++ plugin/src/main/resources/config.yml | 6 + pom.xml | 2 - 15 files changed, 29 insertions(+), 385 deletions(-) delete mode 100644 modules/gamemode-voice-filter-module/.gitignore delete mode 100644 modules/gamemode-voice-filter-module/pom.xml delete mode 100644 modules/gamemode-voice-filter-module/src/main/java/com/craftmend/gamemodefilter/OaGamemodeFilter.java delete mode 100644 modules/gamemode-voice-filter-module/src/main/resources/type.info delete mode 100644 modules/survival-audio-rules-module/.gitignore delete mode 100644 modules/survival-audio-rules-module/README.md delete mode 100644 modules/survival-audio-rules-module/pom.xml delete mode 100644 modules/survival-audio-rules-module/src/main/java/com/craftmend/rules/survival/OaSurvivalRules.java delete mode 100644 modules/survival-audio-rules-module/src/main/resources/type.info create mode 100644 plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/filters/impl/GamemodeFilter.java diff --git a/modules/gamemode-voice-filter-module/.gitignore b/modules/gamemode-voice-filter-module/.gitignore deleted file mode 100644 index a8463100e..000000000 --- a/modules/gamemode-voice-filter-module/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -target/ -target/* -.DS_Store -test-storage/ -test-server/ \ No newline at end of file diff --git a/modules/gamemode-voice-filter-module/pom.xml b/modules/gamemode-voice-filter-module/pom.xml deleted file mode 100644 index 01cfc429c..000000000 --- a/modules/gamemode-voice-filter-module/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - 4.0.0 - - com.craftmend.openaudiomc - openaudiomc-gamemodefilter - ${oa.version} - jar - - - com.craftmend.openaudiomc - OpenAudioMc-Parent - ../../pom.xml - 1.2 - - - OpenAudioMc-gamemodefilter - - - 1.8 - UTF-8 - - - - gamemode-filter - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - de.tr7zw.changeme.nbtapi - com.craftmend.thirdparty.nbt - - - io. - com.craftmend.thirdparty.io - - - org.json. - com.craftmend.thirdparty.json - - - reactor. - com.craftmend.thirdparty.reactor - - - okhttp3 - com.craftmend.thirdparty.okhttp3 - - - okio - com.craftmend.thirdparty.okio - - - org.projectlombok - com.craftmend.thirdparty.org - - - org.mapdb - com.craftmend.thirdparty.mapdb - - - kotlin - com.craftmend.thirdparty.kotlin - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - - - - src/main/resources - true - - - - - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - - - - com.craftmend.openaudiomc - openaudiomc - ${oa.version} - provided - - - - org.spigotmc - spigot-api - 1.17.1-R0.1-SNAPSHOT - provided - - - diff --git a/modules/gamemode-voice-filter-module/src/main/java/com/craftmend/gamemodefilter/OaGamemodeFilter.java b/modules/gamemode-voice-filter-module/src/main/java/com/craftmend/gamemodefilter/OaGamemodeFilter.java deleted file mode 100644 index 4c6174a67..000000000 --- a/modules/gamemode-voice-filter-module/src/main/java/com/craftmend/gamemodefilter/OaGamemodeFilter.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.craftmend.gamemodefilter; - -import com.craftmend.openaudiomc.OpenAudioMc; -import com.craftmend.openaudiomc.api.enums.ModuleEvent; -import com.craftmend.openaudiomc.api.interfaces.ExternalModule; -import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.CustomFilterFunction; -import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.FilterService; -import lombok.NoArgsConstructor; -import org.bukkit.entity.Player; -import org.bukkit.event.Listener; - -@NoArgsConstructor -public final class OaGamemodeFilter extends ExternalModule implements Listener { - - @Override - public String getName() { - return "Gamemode Filter module"; - } - - @Override - public String getDescription() { - return "Only allow players with the same gamemode to hear each other"; - } - - @Override - public void onInitialize() { - - } - - @Override - public void on(ModuleEvent event) { - if (event == ModuleEvent.PLATFORM_LOADED) { - bootComponent(); - } - } - - private void bootComponent() { - // hook into both plugins - OpenAudioMc.getService(FilterService.class).addFilterFunction(new CustomFilterFunction() { - @Override - public boolean isPlayerValidListener(Player listener, Player possibleSpeaker) { - return listener.getGameMode() == possibleSpeaker.getGameMode(); - } - }); - } -} diff --git a/modules/gamemode-voice-filter-module/src/main/resources/type.info b/modules/gamemode-voice-filter-module/src/main/resources/type.info deleted file mode 100644 index 10a135dc0..000000000 --- a/modules/gamemode-voice-filter-module/src/main/resources/type.info +++ /dev/null @@ -1 +0,0 @@ -main: com.craftmend.gamemodefilter.OaGamemodeFilter \ No newline at end of file diff --git a/modules/survival-audio-rules-module/.gitignore b/modules/survival-audio-rules-module/.gitignore deleted file mode 100644 index a8463100e..000000000 --- a/modules/survival-audio-rules-module/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -target/ -target/* -.DS_Store -test-storage/ -test-server/ \ No newline at end of file diff --git a/modules/survival-audio-rules-module/README.md b/modules/survival-audio-rules-module/README.md deleted file mode 100644 index a38e70f0a..000000000 --- a/modules/survival-audio-rules-module/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Skywars hook - -This module works with the [Skywars Reloaded](https://github.com/lukasvdgaag/SkyWarsReloaded) plugin, and is meant to streamline voicechat in skywars game servers. - -Skywars behaviour: - - Everyone will be in one big voicechat during non-game states - - When a match is running, players will only be able to talk to their team mates \ No newline at end of file diff --git a/modules/survival-audio-rules-module/pom.xml b/modules/survival-audio-rules-module/pom.xml deleted file mode 100644 index 06fdf7ad6..000000000 --- a/modules/survival-audio-rules-module/pom.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - 4.0.0 - - com.craftmend.openaudiomc - openaudiomc-survival-audio-rules - ${oa.version} - jar - - - com.craftmend.openaudiomc - OpenAudioMc-Parent - ../../pom.xml - 1.2 - - - OpenAudioMc-pvp-audio-rules - - - 1.8 - UTF-8 - - - - survival-audio-rules-hook - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - de.tr7zw.changeme.nbtapi - com.craftmend.thirdparty.nbt - - - io. - com.craftmend.thirdparty.io - - - org.json. - com.craftmend.thirdparty.json - - - reactor. - com.craftmend.thirdparty.reactor - - - okhttp3 - com.craftmend.thirdparty.okhttp3 - - - okio - com.craftmend.thirdparty.okio - - - org.projectlombok - com.craftmend.thirdparty.org - - - org.mapdb - com.craftmend.thirdparty.mapdb - - - kotlin - com.craftmend.thirdparty.kotlin - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - - - - src/main/resources - true - - - - - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - gcnt - https://nexuslite.gcnt.net/repos/gcnt - - - - - - com.craftmend.openaudiomc - openaudiomc - ${oa.version} - provided - - - - net.gcnt - skywarsreloaded - 5.6.1 - provided - - - - org.spigotmc - spigot-api - 1.17.1-R0.1-SNAPSHOT - provided - - - diff --git a/modules/survival-audio-rules-module/src/main/java/com/craftmend/rules/survival/OaSurvivalRules.java b/modules/survival-audio-rules-module/src/main/java/com/craftmend/rules/survival/OaSurvivalRules.java deleted file mode 100644 index e21724a5d..000000000 --- a/modules/survival-audio-rules-module/src/main/java/com/craftmend/rules/survival/OaSurvivalRules.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.craftmend.rules.survival; - -import com.craftmend.openaudiomc.OpenAudioMc; -import com.craftmend.openaudiomc.api.enums.ModuleEvent; -import com.craftmend.openaudiomc.api.interfaces.ExternalModule; -import com.craftmend.openaudiomc.spigot.modules.rules.MediaRuleService; - -public class OaSurvivalRules extends ExternalModule { - - @Override - public String getName() { - return "Survival Rules"; - } - - @Override - public String getDescription() { - return "Survival friendly audio rules"; - } - - @Override - public void onInitialize() { - - } - - @Override - public void on(ModuleEvent event) { - if (event != ModuleEvent.PLATFORM_LOADED) return; - } -} diff --git a/modules/survival-audio-rules-module/src/main/resources/type.info b/modules/survival-audio-rules-module/src/main/resources/type.info deleted file mode 100644 index d6cdf82fc..000000000 --- a/modules/survival-audio-rules-module/src/main/resources/type.info +++ /dev/null @@ -1 +0,0 @@ -main: com.craftmend.oaparties.RinoarcLegacy \ No newline at end of file diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/migrations/MigrationWorker.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/migrations/MigrationWorker.java index 6b4484f91..b7e0f4fee 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/generic/migrations/MigrationWorker.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/generic/migrations/MigrationWorker.java @@ -54,6 +54,7 @@ public void handleMigrations() { new AddConfigKeyMigration(SETTINGS_IGNORE_REGIONS_WHILE_IN_VEHICLE, "adds the option to disable regions while in a vehicle"), new AddConfigKeyMigration(MESSAGE_VC_DEAFEN, "adds the option to deafen yourself"), new AddConfigKeyMigration(REDIS_SENTINEL_MASTER_SET, "adds the option to use redis sentinel"), + new AddConfigKeyMigration(SETTINGS_VOICE_FILTERS_GAMEMODE, "Add migrations for the new voicechat filters"), }; for (SimpleMigration migration : migrations) { diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java index d7eb0a0f0..d360e230f 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java @@ -75,6 +75,8 @@ public enum StorageKey { SETTINGS_IGNORE_REGIONS_WHILE_IN_VEHICLE(false, "options.ignore-regions-on-vehicles", StorageLocation.CONFIG_FILE), SETTINGS_HYDRATE_REGIONS_ON_BOOT(false, "options.hydrate-regions-on-boot", StorageLocation.CONFIG_FILE), + SETTINGS_VOICE_FILTERS_GAMEMODE(false, "vc-filter.require-same-gamemode", StorageLocation.CONFIG_FILE), + SETTINGS_BEDROCK_PREFIX(false, "options.bedrock-name-prefix", StorageLocation.CONFIG_FILE), SETTINGS_TOKEN_AUTO_LOGIN(false, "options.token-auto-login", StorageLocation.CONFIG_FILE), 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 6f69e4825..2370afc4e 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 @@ -8,6 +8,7 @@ import com.craftmend.openaudiomc.api.interfaces.AudioApi; import com.craftmend.openaudiomc.generic.client.objects.ClientConnection; import com.craftmend.openaudiomc.generic.client.session.RtcSessionManager; +import com.craftmend.openaudiomc.generic.logging.OpenAudioLogger; import com.craftmend.openaudiomc.generic.networking.interfaces.NetworkingService; import com.craftmend.openaudiomc.generic.platform.Platform; import com.craftmend.openaudiomc.generic.platform.interfaces.TaskService; @@ -17,7 +18,9 @@ import com.craftmend.openaudiomc.generic.user.User; import com.craftmend.openaudiomc.spigot.OpenAudioMcSpigot; import com.craftmend.openaudiomc.spigot.modules.players.SpigotPlayerService; +import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.FilterService; import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.PeerFilter; +import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.impl.GamemodeFilter; import com.craftmend.openaudiomc.spigot.modules.voicechat.tasks.PlayerProximityTicker; import com.craftmend.openaudiomc.spigot.modules.voicechat.tasks.PlayerVicinityMessageTask; import com.craftmend.openaudiomc.spigot.modules.voicechat.tasks.TickVoicePacketQueue; @@ -180,6 +183,12 @@ public void onEnable() { if (!event.getClient().isConnected()) return; sendMessage(event.getClient().getUser(), Platform.translateColors(StorageKey.MESSAGE_VC_UNDEAFEN.getString())); }); + + // enable default rules + if (StorageKey.SETTINGS_VOICE_FILTERS_GAMEMODE.getBoolean()) { + OpenAudioLogger.toConsole("Enabling voicechat gamemode filter"); + getService(FilterService.class).addFilterFunction(new GamemodeFilter()); + } } private void sendMessage(User player, String message) { diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/filters/impl/GamemodeFilter.java b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/filters/impl/GamemodeFilter.java new file mode 100644 index 000000000..824ed1335 --- /dev/null +++ b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/filters/impl/GamemodeFilter.java @@ -0,0 +1,11 @@ +package com.craftmend.openaudiomc.spigot.modules.voicechat.filters.impl; + +import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.CustomFilterFunction; +import org.bukkit.entity.Player; + +public class GamemodeFilter implements CustomFilterFunction { + @Override + public boolean isPlayerValidListener(Player listener, Player possibleSpeaker) { + return listener.getGameMode() == possibleSpeaker.getGameMode(); + } +} diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml index b35a397ae..e75719b20 100644 --- a/plugin/src/main/resources/config.yml +++ b/plugin/src/main/resources/config.yml @@ -206,6 +206,12 @@ options: # but it's recommended to leave this on. hydrate-regions-on-boot: true +# Voicechat filters define requirements that players both have to meet before they will be able to hear eachother. +# You can implement custom filters through the API, or enable some of the default ones below. +vc-filter: + + # When enabled, players will only be able to hear eachother if they both share the same gamemode (survival, creative, adventure, spectator) + require-same-gamemode: false # PlaceholderAPI papi: diff --git a/pom.xml b/pom.xml index 668796e4a..d2f52dcff 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,12 @@ modules/jutils plugin modules/voice-join-permission - modules/gamemode-voice-filter-module modules/vistas-client modules/vistas-server modules/rinaorc-legacy modules/mapdb-migrator modules/parties-module modules/skywars-module - modules/survival-audio-rules-module From 825d93914af21843f5d3aaec0901231c141a783f Mon Sep 17 00:00:00 2001 From: Mats Date: Thu, 18 Jan 2024 19:52:07 +0100 Subject: [PATCH 2/3] Add a filter based on common teams --- .../generic/storage/enums/StorageKey.java | 1 + .../voicechat/SpigotVoiceChatService.java | 6 ++++ .../voicechat/filters/impl/TeamFilter.java | 33 +++++++++++++++++++ plugin/src/main/resources/config.yml | 4 +++ 4 files changed, 44 insertions(+) create mode 100644 plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/filters/impl/TeamFilter.java diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java index d360e230f..fa83371ac 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/generic/storage/enums/StorageKey.java @@ -76,6 +76,7 @@ public enum StorageKey { SETTINGS_HYDRATE_REGIONS_ON_BOOT(false, "options.hydrate-regions-on-boot", StorageLocation.CONFIG_FILE), SETTINGS_VOICE_FILTERS_GAMEMODE(false, "vc-filter.require-same-gamemode", StorageLocation.CONFIG_FILE), + SETTINGS_VOICE_FILTERS_TEAM(false, "vc-filter.require-common-team", StorageLocation.CONFIG_FILE), SETTINGS_BEDROCK_PREFIX(false, "options.bedrock-name-prefix", StorageLocation.CONFIG_FILE), SETTINGS_TOKEN_AUTO_LOGIN(false, "options.token-auto-login", StorageLocation.CONFIG_FILE), 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 2370afc4e..7c30939e1 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 @@ -21,6 +21,7 @@ import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.FilterService; import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.PeerFilter; import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.impl.GamemodeFilter; +import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.impl.TeamFilter; import com.craftmend.openaudiomc.spigot.modules.voicechat.tasks.PlayerProximityTicker; import com.craftmend.openaudiomc.spigot.modules.voicechat.tasks.PlayerVicinityMessageTask; import com.craftmend.openaudiomc.spigot.modules.voicechat.tasks.TickVoicePacketQueue; @@ -189,6 +190,11 @@ public void onEnable() { OpenAudioLogger.toConsole("Enabling voicechat gamemode filter"); getService(FilterService.class).addFilterFunction(new GamemodeFilter()); } + + if (StorageKey.SETTINGS_VOICE_FILTERS_TEAM.getBoolean()) { + OpenAudioLogger.toConsole("Enabling voicechat team filter"); + getService(FilterService.class).addFilterFunction(new TeamFilter()); + } } private void sendMessage(User player, String message) { diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/filters/impl/TeamFilter.java b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/filters/impl/TeamFilter.java new file mode 100644 index 000000000..980aed155 --- /dev/null +++ b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/voicechat/filters/impl/TeamFilter.java @@ -0,0 +1,33 @@ +package com.craftmend.openaudiomc.spigot.modules.voicechat.filters.impl; + +import com.craftmend.openaudiomc.spigot.modules.voicechat.filters.CustomFilterFunction; +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.scoreboard.Team; + +public class TeamFilter implements CustomFilterFunction { + + @Override + public boolean isPlayerValidListener(Player listener, Player possibleSpeaker) { + // is there a scoreboard present? + if (Bukkit.getScoreboardManager() == null) return true; + + boolean assignmentMatch = true; + for (Team team : Bukkit.getScoreboardManager().getMainScoreboard().getTeams()) { + boolean foundPlayerA = team.hasEntry(listener.getName()); + boolean foundPlayerB = team.hasEntry(possibleSpeaker.getName()); + + if (foundPlayerA && foundPlayerB) { + return true; + } + + // is only one of the players in the team? + if (foundPlayerA || foundPlayerB) { + assignmentMatch = false; + } + } + + return assignmentMatch; + } + +} diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml index e75719b20..4066fe8e3 100644 --- a/plugin/src/main/resources/config.yml +++ b/plugin/src/main/resources/config.yml @@ -213,6 +213,10 @@ vc-filter: # When enabled, players will only be able to hear eachother if they both share the same gamemode (survival, creative, adventure, spectator) require-same-gamemode: false + # When enabled, players will only be able to hear eachother if they both share the same team. Edge cases: + # - Players without a team can only hear other players without a team + require-common-team: false + # PlaceholderAPI papi: # Value to display when player is connected to the web client From 522de5fb8a904a70fb24668fe7d532afa1dd5f0c Mon Sep 17 00:00:00 2001 From: Mats Date: Thu, 18 Jan 2024 19:59:59 +0100 Subject: [PATCH 3/3] yeye --- .tool-versions | 2 +- modules/jutils/dependency-reduced-pom.xml | 2 +- plugin/src/main/bash/data.bin | 2 +- .../openaudiomc/spigot/modules/regions/RegionModule.java | 1 + plugin/src/main/resources/data.bin | 2 +- plugin/src/main/resources/openaudiomc-build.properties | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.tool-versions b/.tool-versions index b1e51edda..d22bf7efc 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -java adoptopenjdk-8.0.332+9 +java openjdk-18.0.2.1 diff --git a/modules/jutils/dependency-reduced-pom.xml b/modules/jutils/dependency-reduced-pom.xml index e7b3443e2..3415482fa 100644 --- a/modules/jutils/dependency-reduced-pom.xml +++ b/modules/jutils/dependency-reduced-pom.xml @@ -84,7 +84,7 @@ - 8 8 + 8 diff --git a/plugin/src/main/bash/data.bin b/plugin/src/main/bash/data.bin index 8cc7b3db7..107567be3 100755 --- a/plugin/src/main/bash/data.bin +++ b/plugin/src/main/bash/data.bin @@ -1 +1 @@ -BUILD_NUM="1046" +BUILD_NUM="1050" diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/regions/RegionModule.java b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/regions/RegionModule.java index 6a22be18d..c89a3a4a1 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/regions/RegionModule.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/regions/RegionModule.java @@ -71,6 +71,7 @@ public RegionModule(@Nullable AbstractRegionAdapter customAdapter) { // update null values should be set to defaults if (region.getLoop() == null) region.setLoop(true); + if (region.getDoSync() == null) region.setDoSync(true); // does this region adhere to a specific world? if (region.hasWorlds()) { diff --git a/plugin/src/main/resources/data.bin b/plugin/src/main/resources/data.bin index 8cc7b3db7..107567be3 100755 --- a/plugin/src/main/resources/data.bin +++ b/plugin/src/main/resources/data.bin @@ -1 +1 @@ -BUILD_NUM="1046" +BUILD_NUM="1050" diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties index 0c793516d..68af46669 100644 --- a/plugin/src/main/resources/openaudiomc-build.properties +++ b/plugin/src/main/resources/openaudiomc-build.properties @@ -1,3 +1,3 @@ -BUILD_VERSION="1046" -BUILD_COMMIT="ecd0c84a2fff2ce4f49d9b3a94e173cc8eb45b43" +BUILD_VERSION="1050" +BUILD_COMMIT="825d93914af21843f5d3aaec0901231c141a783f" BUILD_AUTHOR="Mats"