From dbfdae63f1137ebe282d352adee822f2dfde90e5 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sun, 20 Dec 2020 20:42:14 -0500
Subject: [PATCH] Add precautions to prevent stack traces on incomplete/unknown
 place sounds (#1717)

---
 .../java/world/JavaPlayBuiltinSoundTranslator.java        | 8 ++++++--
 .../network/translators/world/block/BlockTranslator.java  | 6 +++++-
 connector/src/main/resources/mappings                     | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java
index d849c9179..1c057f45f 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java
@@ -34,8 +34,8 @@ import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 import org.geysermc.connector.network.translators.sound.SoundRegistry;
+import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 
 @Translator(packet = ServerPlayBuiltinSoundPacket.class)
 public class JavaPlayBuiltinSoundTranslator extends PacketTranslator<ServerPlayBuiltinSoundPacket> {
@@ -82,7 +82,11 @@ public class JavaPlayBuiltinSoundTranslator extends PacketTranslator<ServerPlayB
             // Bedrock has a number for each type of note, then proceeds up the scale by adding to that number
             soundPacket.setExtraData(soundMapping.getExtraData() + (int)(Math.round((Math.log10(packet.getPitch()) / Math.log10(2)) * 12)) + 12);
         } else if (sound == SoundEvent.PLACE && soundMapping.getExtraData() == -1) {
-            soundPacket.setExtraData(BlockTranslator.getBedrockBlockId(BlockTranslator.getJavaBlockState(soundMapping.getIdentifier())));
+            if (!soundMapping.getIdentifier().equals(":")) {
+                soundPacket.setExtraData(BlockTranslator.getBedrockBlockId(BlockTranslator.getJavaBlockState(soundMapping.getIdentifier())));
+            } else {
+                session.getConnector().getLogger().debug("PLACE sound mapping identifier was invalid! Please report: " + packet.toString());
+            }
             soundPacket.setIdentifier(":");
         } else {
             soundPacket.setExtraData(soundMapping.getExtraData());
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java
index e0821ae76..8869199dd 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java
@@ -343,8 +343,12 @@ public class BlockTranslator {
         return BLOCK_STATE_VERSION;
     }
 
+    /**
+     * @param javaId the Java string identifier to search for
+     * @return the Java block state integer, or {@link #JAVA_AIR_ID} if there is no valid entry.
+     */
     public static int getJavaBlockState(String javaId) {
-        return JAVA_ID_BLOCK_MAP.get(javaId);
+        return JAVA_ID_BLOCK_MAP.getOrDefault(javaId, JAVA_AIR_ID);
     }
 
     public static boolean isWaterlogged(int state) {
diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings
index 2d14c9dc3..3f4707c0d 160000
--- a/connector/src/main/resources/mappings
+++ b/connector/src/main/resources/mappings
@@ -1 +1 @@
-Subproject commit 2d14c9dc3d75df7463fc7605a6cff63b5926a03e
+Subproject commit 3f4707c0d26427dfe2ac79eca68e6048732f4412