From dda0172dedde65131dbe3c61170ddb9163096f6b Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sun, 9 May 2021 01:19:06 -0400
Subject: [PATCH] Allow more blocks to have a place sound on standalone (#2183)

Items such as wall torch blocks currently do not have a place sound on standalone, as their block identifier differs from their item identifier. This commit uses the pick item logic in order to fix place sounds for such blocks.
---
 .../java/world/JavaBlockChangeTranslator.java        |  2 +-
 .../connector/registry/type/BlockMapping.java        | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java
index e362e335f..de9563d9b 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java
@@ -68,7 +68,7 @@ public class JavaBlockChangeTranslator extends PacketTranslator<ServerBlockChang
         // We need to check if the identifier is the same, else a packet with the sound of what the
         // player has in their hand is played, despite if the block is being placed or not
         boolean contains = false;
-        String identifier = BlockTranslator.getJavaIdBlockMap().inverse().get(packet.getRecord().getBlock()).split("\\[")[0];
+        String identifier = BlockTranslator.getBlockMapping(packet.getRecord().getBlock()).getItemIdentifier();
         if (identifier.equals(session.getLastBlockPlacedId())) {
             contains = true;
         }
diff --git a/connector/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java b/connector/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java
index 8aa06abc2..f3eaddd91 100644
--- a/connector/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java
+++ b/connector/src/main/java/org/geysermc/connector/registry/type/BlockMapping.java
@@ -59,6 +59,18 @@ public class BlockMapping {
         return javaIdentifier.split("\\[")[0];
     }
 
+    /**
+     * @return the corresponding Java identifier for this item
+     */
+    public String getItemIdentifier() {
+        if (pickItem != null && !pickItem.equals("minecraft:air")) {
+            // Spawners can have air as their pick item which we are not interested in.
+            return pickItem;
+        }
+
+        return getCleanJavaIdentifier();
+    }
+
     /**
      * Get the item a Java client would receive when pressing
      * the Pick Block key on a specific Java block state.