Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-02 14:38:26 +01:00
Code Issues Projects Releases Wiki Activity

Proper sound seeding (#74)

Browse Source 
Co-authored-by: iam <iam4722202468@users.noreply.github.com>
(cherry picked from commit 9e2a200243)
This commit is contained in:
hapily04 2023-11-19 11:06:50 -06:00 committed by Matt Worzala
parent 066eeda6dd
commit 8d117164f6
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/minestom/server/adventure/AdventurePacketConvertor.java
View File

@ -10,7 +10,6 @@ import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.title.Title; import net.kyori.adventure.title.Title;
import net.kyori.adventure.title.TitlePart; import net.kyori.adventure.title.TitlePart;
import net.minestom.server.coordinate.Pos;
import net.minestom.server.coordinate.Vec; import net.minestom.server.coordinate.Vec;
import net.minestom.server.entity.Entity; import net.minestom.server.entity.Entity;
import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacket;
@ -20,6 +19,7 @@ import net.minestom.server.utils.TickUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Collection; import java.util.Collection;
import java.util.concurrent.ThreadLocalRandom;
/** /**
* Utility methods to convert adventure enums to their packet values. * Utility methods to convert adventure enums to their packet values.
@ -101,7 +101,8 @@ public class AdventurePacketConvertor {
} }
/** /**
* Creates a sound packet from a sound and a location. * Creates a sound packet from a sound and a location.<br>
* Random variation by default unless a seed is provided in the {@link Sound}.
* *
* @param sound the sound * @param sound the sound
* @param x the x coordinate * @param x the x coordinate
@ -111,17 +112,19 @@ public class AdventurePacketConvertor {
*/ */
public static @NotNull ServerPacket createSoundPacket(@NotNull Sound sound, double x, double y, double z) { public static @NotNull ServerPacket createSoundPacket(@NotNull Sound sound, double x, double y, double z) {
final SoundEvent minestomSound = SoundEvent.fromNamespaceId(sound.name().asString()); final SoundEvent minestomSound = SoundEvent.fromNamespaceId(sound.name().asString());
final long seed = sound.seed().orElse(ThreadLocalRandom.current().nextLong());
if (minestomSound == null) { if (minestomSound == null) {
return new SoundEffectPacket(sound.name().asString(), null, sound.source(), return new SoundEffectPacket(sound.name().asString(), null, sound.source(),
new Vec(x, y, z), sound.volume(), sound.pitch(), 0); new Vec(x, y, z), sound.volume(), sound.pitch(), seed);
} else { } else {
return new SoundEffectPacket(minestomSound, null, sound.source(), return new SoundEffectPacket(minestomSound, null, sound.source(),
new Vec(x, y, z), sound.volume(), sound.pitch(), 0); new Vec(x, y, z), sound.volume(), sound.pitch(), seed);
} }
} }
/** /**
* Creates a sound effect packet from a sound and an emitter. * Creates a sound effect packet from a sound and an emitter.<br>
* Random variation by default unless a seed is provided in the {@link Sound}.
* *
* @param sound the sound * @param sound the sound
* @param emitter the emitter, must be an {@link Entity} * @param emitter the emitter, must be an {@link Entity}
@ -134,11 +137,12 @@ public class AdventurePacketConvertor {
throw new IllegalArgumentException("you can only call this method with entities"); throw new IllegalArgumentException("you can only call this method with entities");
final SoundEvent minestomSound = SoundEvent.fromNamespaceId(sound.name().asString()); final SoundEvent minestomSound = SoundEvent.fromNamespaceId(sound.name().asString());
final long seed = sound.seed().orElse(ThreadLocalRandom.current().nextLong());
if (minestomSound != null) { if (minestomSound != null) {
return new EntitySoundEffectPacket(minestomSound, null, sound.source(), entity.getEntityId(), sound.volume(), sound.pitch(), 0); return new EntitySoundEffectPacket(minestomSound, null, sound.source(), entity.getEntityId(), sound.volume(), sound.pitch(), seed);
} else { } else {
return new EntitySoundEffectPacket(sound.name().asString(), null, sound.source(), entity.getEntityId(), sound.volume(), sound.pitch(), 0); return new EntitySoundEffectPacket(sound.name().asString(), null, sound.source(), entity.getEntityId(), sound.volume(), sound.pitch(), seed);
} }
} }