mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-04 14:44:43 +02:00
Compare commits
2 Commits
fix/plotMu
...
fix/compon
Author | SHA1 | Date | |
---|---|---|---|
c77037ce47 | |||
746bf93813 |
@ -40,7 +40,6 @@ 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;
|
||||||
@ -52,6 +51,7 @@ 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,22 +309,19 @@ 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) {
|
||||||
if (PlotSquared.platform().serverVersion()[1] >= 19) {
|
// Let's just stop all the discs because why not?
|
||||||
player.stopSound(SoundCategory.MUSIC);
|
for (final Sound sound : Arrays.stream(Sound.values())
|
||||||
return;
|
.filter(sound -> sound.name().contains("DISC")).toList()) {
|
||||||
|
player.stopSound(sound);
|
||||||
}
|
}
|
||||||
// 1.18 and downwards require a specific Sound to stop (even tho the packet does not??)
|
// this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, Material.AIR);
|
||||||
for (final Sound sound : Sound.values()) {
|
} else {
|
||||||
if (sound.name().startsWith("MUSIC_DISC")) {
|
// this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, id.to(Material.class));
|
||||||
this.player.stopSound(sound, SoundCategory.MUSIC);
|
this.player.playSound(BukkitUtil.adapt(location),
|
||||||
}
|
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
|
||||||
@Override
|
@Override
|
||||||
|
@ -37,7 +37,9 @@ import com.sk89q.worldedit.regions.CuboidRegion;
|
|||||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
public class FaweRegionManager extends BukkitRegionManager {
|
public class FaweRegionManager extends BukkitRegionManager {
|
||||||
@ -59,7 +61,10 @@ public class FaweRegionManager extends BukkitRegionManager {
|
|||||||
@Nullable PlotPlayer<?> actor,
|
@Nullable PlotPlayer<?> actor,
|
||||||
@Nullable QueueCoordinator queue
|
@Nullable QueueCoordinator queue
|
||||||
) {
|
) {
|
||||||
return delegate.setCuboids(area, regions, blocks, minY, maxY, queue.getCompleteTask());
|
return delegate.setCuboids(
|
||||||
|
area, regions, blocks, minY, maxY,
|
||||||
|
Objects.requireNonNullElseGet(queue, area::getQueue).getCompleteTask()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -111,7 +116,7 @@ public class FaweRegionManager extends BukkitRegionManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean regenerateRegion(final Location pos1, final Location pos2, boolean ignore, final Runnable whenDone) {
|
public boolean regenerateRegion(final @NotNull Location pos1, final @NotNull Location pos2, boolean ignore, final Runnable whenDone) {
|
||||||
return delegate.regenerateRegion(pos1, pos2, ignore, whenDone);
|
return delegate.regenerateRegion(pos1, pos2, ignore, whenDone);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user