Google
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix playsounds

This commit is contained in:
RednedEpic 2020-05-03 15:56:46 -05:00
parent 7f7d89e517
commit 1aca44ec7f
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPlaySoundTranslator.java → connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayerPlaySoundTranslator.java
View File

@ -21,9 +21,10 @@
* *
* @author GeyserMC * @author GeyserMC
* @link https://github.com/GeyserMC/Geyser * @link https://github.com/GeyserMC/Geyser
*
*/ */
package org.geysermc.connector.network.translators.java.entity.player; package org.geysermc.connector.network.translators.java.world;
import com.github.steveice10.mc.protocol.data.game.world.sound.BuiltinSound; import com.github.steveice10.mc.protocol.data.game.world.sound.BuiltinSound;
import com.github.steveice10.mc.protocol.data.game.world.sound.CustomSound; import com.github.steveice10.mc.protocol.data.game.world.sound.CustomSound;
@ -50,7 +51,7 @@ public class JavaPlayerPlaySoundTranslator extends PacketTranslator<ServerPlaySo
return; return;
} }
SoundUtils.SoundMapping soundMapping = SoundUtils.fromJava(packetSound); SoundUtils.SoundMapping soundMapping = SoundUtils.fromJava(packetSound.replace("minecraft:", ""));
session.getConnector().getLogger() session.getConnector().getLogger()
.debug("[PlaySound] Sound mapping " + packetSound + " -> " .debug("[PlaySound] Sound mapping " + packetSound + " -> "
+ soundMapping + (soundMapping == null ? "[not found]" : "") + soundMapping + (soundMapping == null ? "[not found]" : "")
@ -67,7 +68,7 @@ public class JavaPlayerPlaySoundTranslator extends PacketTranslator<ServerPlaySo
PlaySoundPacket playSoundPacket = new PlaySoundPacket(); PlaySoundPacket playSoundPacket = new PlaySoundPacket();
playSoundPacket.setSound(playsound); playSoundPacket.setSound(playsound);
playSoundPacket.setPosition(Vector3f.from(SoundUtils.processCoordinate(packet.getX()), SoundUtils.processCoordinate(packet.getY()), SoundUtils.processCoordinate(packet.getZ()))); playSoundPacket.setPosition(Vector3f.from(packet.getX(), packet.getY(), packet.getZ()));
playSoundPacket.setVolume(packet.getVolume()); playSoundPacket.setVolume(packet.getVolume());
playSoundPacket.setPitch(packet.getPitch()); playSoundPacket.setPitch(packet.getPitch());

4
connector/src/main/java/org/geysermc/connector/utils/SoundUtils.java
View File

@ -91,10 +91,6 @@ public class SoundUtils {
} }
} }
public static double processCoordinate(double f) {
return (f / 3D) * 8D;
}
@Data @Data
@ToString @ToString
public static class SoundMapping { public static class SoundMapping {