From c44708cc220cc28bad14f11445e67926b17dd600 Mon Sep 17 00:00:00 2001
From: William Johnstone <william@endevrr.com>
Date: Tue, 7 Apr 2020 21:22:10 +0100
Subject: [PATCH] Add requested changes

---
 .../connector/entity/FallingBlockEntity.java  | 29 +++++++++++++++++--
 .../spawn/JavaSpawnObjectTranslator.java      |  7 +----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java b/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java
index 5ce614a7a..5a0cac8f4 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/FallingBlockEntity.java
@@ -1,3 +1,28 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
 package org.geysermc.connector.entity;
 
 import com.nukkitx.math.vector.Vector3f;
@@ -10,8 +35,6 @@ public class FallingBlockEntity extends Entity {
     public FallingBlockEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation, int javaId) {
         super(entityId, geyserId, entityType, position, motion, rotation);
 
-        int bedrockId = BlockTranslator.getBedrockBlockId(javaId);
-
-        this.metadata.put(EntityData.VARIANT, bedrockId);
+        this.metadata.put(EntityData.VARIANT, BlockTranslator.getBedrockBlockId(javaId));
     }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnObjectTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnObjectTranslator.java
index 827e24feb..c3998f870 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnObjectTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/spawn/JavaSpawnObjectTranslator.java
@@ -49,11 +49,6 @@ public class JavaSpawnObjectTranslator extends PacketTranslator<ServerSpawnObjec
         if (packet.getType() == ObjectType.ITEM_FRAME)
             return;
 
-        int javaId = -1;
-        if (packet.getType() == ObjectType.FALLING_BLOCK) {
-            javaId = ((FallingBlockData) packet.getData()).getId();
-        }
-
         Vector3f position = Vector3f.from(packet.getX(), packet.getY(), packet.getZ());
         Vector3f motion = Vector3f.from(packet.getMotionX(), packet.getMotionY(), packet.getMotionZ());
         Vector3f rotation = Vector3f.from(packet.getYaw(), packet.getPitch(), 0);
@@ -69,7 +64,7 @@ public class JavaSpawnObjectTranslator extends PacketTranslator<ServerSpawnObjec
             Entity entity;
             if (packet.getType() == ObjectType.FALLING_BLOCK) {
                 entity = new FallingBlockEntity(packet.getEntityId(), session.getEntityCache().getNextEntityId().incrementAndGet(),
-                        type, position, motion, rotation, javaId);
+                        type, position, motion, rotation, ((FallingBlockData) packet.getData()).getId());
             } else {
                 Constructor<? extends Entity> entityConstructor = entityClass.getConstructor(long.class, long.class, EntityType.class,
                         Vector3f.class, Vector3f.class, Vector3f.class);