Skip to content

Commit 0c242bd

Browse files
committed
fix region sync
1 parent e9f0ec5 commit 0c242bd

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

plugin/src/main/bash/data.bin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
BUILD_NUM="1540"
1+
BUILD_NUM="1542"

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.craftmend.openaudiomc.api.media.Media;
44
import com.craftmend.openaudiomc.generic.database.internal.DataStore;
5+
import com.craftmend.openaudiomc.generic.storage.enums.StorageKey;
56
import com.craftmend.openaudiomc.generic.utils.data.ArrayUtil;
67
import com.craftmend.openaudiomc.spigot.OpenAudioMcSpigot;
78
import com.craftmend.openaudiomc.spigot.modules.regions.registry.WorldRegionManager;
@@ -45,6 +46,12 @@ public Media getMediaForWorld(WorldRegionManager worldRegionManager) {
4546
if (loop == null) loop = true;
4647
Media media = worldRegionManager.getRegionMedia(source, volume, fadeTimeMs, loop);
4748
media.setDoPickup(this.doSync);
49+
50+
// is region sync explicitly disabled?
51+
if (!StorageKey.SETTINGS_REGIONS_SYNC.getBoolean()) {
52+
media.setDoPickup(false);
53+
}
54+
4855
media.setFadeTime(fadeTimeMs);
4956
return media;
5057
}

plugin/src/main/resources/data.bin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
BUILD_NUM="1540"
1+
BUILD_NUM="1542"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
BUILD_VERSION="1540"
2-
BUILD_COMMIT="568d81624c78357703937477b5ed2413f84ddc02"
1+
BUILD_VERSION="1542"
2+
BUILD_COMMIT="e9f0ec53340a4dde67aa2bbe5515b2050d0e7615"
33
BUILD_AUTHOR="Mats"

0 commit comments

Comments
 (0)