From 516fc51162d12da5f4828aabc075b4d80f9683ff Mon Sep 17 00:00:00 2001
From: AJ Ferguson <fergusonjva@gmail.com>
Date: Wed, 5 Feb 2020 20:23:06 -0900
Subject: [PATCH] Small changes

---
 .../connector/network/translators/block/BlockTranslator.java  | 2 +-
 .../translators/java/world/JavaChunkDataTranslator.java       | 4 ++--
 .../src/main/java/org/geysermc/connector/utils/Toolbox.java   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
index e42891714..c0a8aa9a8 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
@@ -34,6 +34,6 @@ public class BlockTranslator {
     }
 
     public BlockEntry getBlockEntry(String javaIdentifier) {
-        return Toolbox.JAVA_IDENTIFIER_TO_ENTRY.get(javaIdentifier);
+        return Toolbox.JAVA_IDENTIFIER_TO_BLOCK_ENTRY.get(javaIdentifier);
     }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
index 90467b6b8..7dbf92854 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
@@ -77,13 +77,13 @@ public class JavaChunkDataTranslator extends PacketTranslator<ServerChunkDataPac
                     levelChunkPacket.setData(payload);
                     session.getUpstream().sendPacket(levelChunkPacket);
                 } else {
+                    final int xOffset = packet.getColumn().getX() << 4;
+                    final int zOffset = packet.getColumn().getZ() << 4;
                     Chunk[] chunks = packet.getColumn().getChunks();
                     for (int i = 0; i < chunks.length; i++) {
                         Chunk chunk = chunks[i];
                         if (chunk == null) continue;
-                        final int xOffset = packet.getColumn().getX() << 4;
                         final int yOffset = i * 16;
-                        final int zOffset = packet.getColumn().getZ() << 4;
                         for (int x = 0; x < 16; x++) {
                             for (int y = 0; y < 16; y++) {
                                 for (int z = 0; z < 16; z++) {
diff --git a/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java b/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
index 8d3b96837..5f46225c3 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
@@ -50,7 +50,7 @@ public class Toolbox {
 
     public static final Int2ObjectMap<ItemEntry> ITEM_ENTRIES = new Int2ObjectOpenHashMap<>();
     public static final Int2ObjectMap<BlockEntry> BLOCK_ENTRIES = new Int2ObjectOpenHashMap<>();
-    public static final Map<String, BlockEntry> JAVA_IDENTIFIER_TO_ENTRY = new HashMap<>();
+    public static final Map<String, BlockEntry> JAVA_IDENTIFIER_TO_BLOCK_ENTRY = new HashMap<>();
 
     public static void init() {
         InputStream stream = GeyserConnector.class.getClassLoader().getResourceAsStream("bedrock/runtime_block_states.dat");
@@ -141,7 +141,7 @@ public class Toolbox {
                     }
                     BlockEntry blockEntry = new BlockEntry(javaEntry.getKey(), javaIndex, bedrockIndex);
                     BLOCK_ENTRIES.put(javaIndex, blockEntry);
-                    JAVA_IDENTIFIER_TO_ENTRY.put(javaEntry.getKey(), blockEntry);
+                    JAVA_IDENTIFIER_TO_BLOCK_ENTRY.put(javaEntry.getKey(), blockEntry);
                     continue javaLoop;
                 }
             }