EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-24 14:16:44 +01:00
Code Issues Projects Releases Wiki Activity

Use MUSIC soundcategory for plot music flag (#4302)

Browse Source 
chore/fix: use MUSIC sound category for plot music
This commit is contained in:
Pierre Maurice Schwang 2024-01-21 12:38:46 +01:00 committed by GitHub
parent fccc146053
commit 9566af5fda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
View File

@ -40,6 +40,7 @@ import io.papermc.lib.PaperLib;
import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.Audience;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.SoundCategory;
import org.bukkit.WeatherType; import org.bukkit.WeatherType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;
@ -51,7 +52,6 @@ import org.bukkit.potion.PotionEffectType;
import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.NonNegative;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Arrays;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -309,18 +309,21 @@ public class BukkitPlayer extends PlotPlayer<Player> {
@Override @Override
public void playMusic(final @NonNull Location location, final @NonNull ItemType id) { public void playMusic(final @NonNull Location location, final @NonNull ItemType id) {
if (id == ItemTypes.AIR) { if (id == ItemTypes.AIR) {
// Let's just stop all the discs because why not? if (PlotSquared.platform().serverVersion()[1] >= 19) {
for (final Sound sound : Arrays.stream(Sound.values()) player.stopSound(SoundCategory.MUSIC);
.filter(sound -> sound.name().contains("DISC")).toList()) { return;
player.stopSound(sound);
} }
// this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, Material.AIR); // 1.18 and downwards require a specific Sound to stop (even tho the packet does not??)
} else { for (final Sound sound : Sound.values()) {
// this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, id.to(Material.class)); if (sound.name().startsWith("MUSIC_DISC")) {
this.player.playSound(BukkitUtil.adapt(location), this.player.stopSound(sound, SoundCategory.MUSIC);
Sound.valueOf(BukkitAdapter.adapt(id).name()), Float.MAX_VALUE, 1f }
); }
return;
} }
this.player.playSound(BukkitUtil.adapt(location), Sound.valueOf(BukkitAdapter.adapt(id).name()),
SoundCategory.MUSIC, 1f, 1f
);
} }
@SuppressWarnings("deprecation") // Needed for Spigot compatibility @SuppressWarnings("deprecation") // Needed for Spigot compatibility