Lexian-droid/Ambient-Audio-Zone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

fix: keep active sounds from restarting during movement
Build / maven (push) Successful in 43s
Details
Build and publish release / Build and publish Ambient Audio Zone (push) Successful in 45s
Details

Browse Source
This commit is contained in:
root
2026-08-04 06:06:30 +02:00
parent f11366088c
commit 247aa3cc90
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/lexian/ambientaudio/service/PlaybackService.java
+5 -5
View File
@@ -12,13 +12,13 @@ import java.util.stream.Collectors;
public final class PlaybackService {
private final JavaPlugin plugin; private final ZoneIndex index = new ZoneIndex();
private final Map<UUID, Map<String, ActiveSound>> active = new HashMap<>();
private boolean blending; private boolean followPlayer; private long leaveGraceTicks, loopRestartTicks; private int taskId = -1;
private boolean blending; private boolean followPlayer, fadeVolumeUpdates; private long leaveGraceTicks, loopRestartTicks; private int taskId = -1;
public PlaybackService(JavaPlugin plugin) { this.plugin = plugin; }
public void configure(Collection<AudioZone> zones, int intervalTicks, long leaveGraceTicks, boolean blending,
boolean followPlayer, long loopRestartTicks) {
boolean followPlayer, boolean fadeVolumeUpdates, long loopRestartTicks) {
stopAll(); index.rebuild(zones); this.blending = blending; this.leaveGraceTicks = leaveGraceTicks;
this.followPlayer = followPlayer; this.loopRestartTicks = loopRestartTicks;
this.followPlayer = followPlayer; this.fadeVolumeUpdates = fadeVolumeUpdates; this.loopRestartTicks = loopRestartTicks;
if (taskId != -1) Bukkit.getScheduler().cancelTask(taskId);
taskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, this::tick, intervalTicks, intervalTicks);
}
@@ -39,7 +39,7 @@ public final class PlaybackService {
} else if (zone.loop() && loopRestartTicks > 0 && now - sound.startedAtTick() >= loopRestartTicks) {
play(player, zone, volume);
current.put(zone.normalizedName(), new ActiveSound(zone, Long.MAX_VALUE, now, now, volume));
} else if (followPlayer && now - sound.lastPacketTick() >= 40 && Math.abs(sound.volume() - volume) >= 0.10f) {
} else if (followPlayer && fadeVolumeUpdates && now - sound.lastPacketTick() >= 40 && Math.abs(sound.volume() - volume) >= 0.10f) {
// Bukkit has no volume-update packet. Rate-limit fade packets and stop the previous
// packet first; otherwise repeated entity sound packets overlap on the client.
play(player, zone, volume);
@@ -70,7 +70,7 @@ public final class PlaybackService {
else player.playSound(zone.originLocation(player.getWorld()), zone.sound(), zone.category(), zone.volume(), zone.pitch());
}
private float volumeFor(AudioZone zone, Player player) {
if (!followPlayer) return zone.volume();
if (!followPlayer || !fadeVolumeUpdates) return zone.volume();
double fade = zone.fadeDistance();
double distance = Math.sqrt(zone.distanceToAudibleAreaSquared(player.getLocation()));
double multiplier = fade == 0 ? (distance == 0 ? 1 : 0) : Math.max(0, 1 - distance / fade);