From 7df476183abe005b93593e9ac774b015f2909d20 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+DoctorMacc@users.noreply.github.com> Date: Sat, 8 Aug 2020 17:50:32 -0400 Subject: [PATCH] Implement proper mappings for pistons, dropper, dispenser (#1103) This commit gets rid of the hacky workaround implemented for pistons, droppers and dispensers and actually implements the vanilla data values. --- .../connector/network/translators/item/ItemRegistry.java | 7 ------- connector/src/main/resources/mappings | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemRegistry.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemRegistry.java index 6fc56472..4828fbf2 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemRegistry.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemRegistry.java @@ -214,13 +214,6 @@ public class ItemRegistry { return itemEntry; } } - // If item find was unsuccessful first time, we try again while ignoring damage - // Fixes piston, sticky pistons, dispensers and droppers turning into air from creative inventory - for (ItemEntry itemEntry : ITEM_ENTRIES.values()) { - if (itemEntry.getBedrockId() == data.getId()) { - return itemEntry; - } - } // This will hide the message when the player clicks with an empty hand if (data.getId() != 0 && data.getDamage() != 0) { diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings index 83a34687..a222d85d 160000 --- a/connector/src/main/resources/mappings +++ b/connector/src/main/resources/mappings @@ -1 +1 @@ -Subproject commit 83a3468766b82ea97bd1ae8a1e92bffcc2745349 +Subproject commit a222d85dc0b8e8c95a150f2d488a6a25390b8c2f