From 215e5a7e214f3cc429f077c37b83674c34210c39 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
Date: Sun, 31 May 2020 21:47:54 -0400
Subject: [PATCH] Add custom minecart metadata (#713)

Adds display item, offset, and enable values.
---
 .../connector/entity/MinecartEntity.java        | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/connector/src/main/java/org/geysermc/connector/entity/MinecartEntity.java b/connector/src/main/java/org/geysermc/connector/entity/MinecartEntity.java
index ee004a257..c2d7d47d5 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/MinecartEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/MinecartEntity.java
@@ -30,6 +30,7 @@ import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.data.EntityData;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 
 public class MinecartEntity extends Entity {
 
@@ -54,6 +55,22 @@ public class MinecartEntity extends Entity {
             metadata.put(EntityData.HURT_TIME, Math.min((int) (float) entityMetadata.getValue(), 15));
         }
 
+        // Custom block
+        if (entityMetadata.getId() == 10) {
+            metadata.put(EntityData.DISPLAY_ITEM, BlockTranslator.getBedrockBlockId((int) entityMetadata.getValue()));
+        }
+
+        // Custom block offset
+        if (entityMetadata.getId() == 11) {
+            metadata.put(EntityData.DISPLAY_OFFSET, entityMetadata.getValue());
+        }
+
+        // If the custom block should be enabled
+        if (entityMetadata.getId() == 12) {
+            // Needs a byte based off of Java's boolean
+            metadata.put(EntityData.HAS_DISPLAY, (byte) ((boolean) entityMetadata.getValue() ? 1 : 0));
+        }
+
         super.updateBedrockMetadata(entityMetadata, session);
     }