From 7171ade0bd2da19fc70e3c36005371c50048ab2a Mon Sep 17 00:00:00 2001
From: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
Date: Fri, 18 Nov 2022 11:04:22 -0800
Subject: [PATCH] Prevent double placement for custom block items (#3399)

---
 .../populator/CustomItemRegistryPopulator.java      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java
index 94e04e972..0e40f9c43 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java
@@ -124,6 +124,10 @@ public class CustomItemRegistryPopulator {
             computeArmorProperties(mapping.getArmorType(), mapping.getProtectionValue(), componentBuilder);
         }
 
+        if (mapping.getFirstBlockRuntimeId() != null) {
+            computeBlockItemProperties(mapping.getBedrockIdentifier(), componentBuilder);
+        }
+
         computeRenderOffsets(false, customItemData, componentBuilder);
 
         componentBuilder.putCompound("item_properties", itemProperties.build());
@@ -260,6 +264,15 @@ public class CustomItemRegistryPopulator {
         }
     }
 
+    private static void computeBlockItemProperties(String blockItem, NbtMapBuilder componentBuilder) {
+        // carved pumpkin should be able to be worn and for that we would need to add wearable and armor with protection 0 here
+        // however this would have the side effect of preventing carved pumpkins from working as an attachable on the RP side outside the head slot
+        // it also causes the item to glitch when right clicked to "equip" so this should only be added here later if these issues can be overcome
+
+        // all block items registered should be given this component to prevent double placement
+        componentBuilder.putCompound("minecraft:block_placer", NbtMap.builder().putString("block", blockItem).build());
+    }
+
     private static void computeRenderOffsets(boolean isHat, CustomItemData customItemData, NbtMapBuilder componentBuilder) {
         if (isHat) {
             componentBuilder.remove("minecraft:render_offsets");