From 41efdda320c6680ecf1c0bea6d54a2a00a26944a Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 26 Dec 2018 14:04:20 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4?=
 =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=B8=D1=8F=20merge,=20=D0=BD=D0=B5=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BB=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8(!)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java   | 6 ++++--
 anvil-loader/src/main/java/mc/world/anvil/AnvilChunk.java   | 2 +-
 .../core/network/proto_1_12_2/packets/ChunkDataPacket.java  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java b/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java
index c452650..990e6e9 100644
--- a/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java
+++ b/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java
@@ -62,8 +62,10 @@ public class AnvilBlock implements Block {
                 (chunkSection.getParent().getZ() << 4) + location.getZ()
         );
 
-        compoundTag.getValue().remove("Items");
-        compoundTag.getValue().remove("Lock");
+        if (compoundTag != null) {
+            compoundTag.getValue().remove("Items");
+            compoundTag.getValue().remove("Lock");
+        }
 
         return compoundTag;
     }
diff --git a/anvil-loader/src/main/java/mc/world/anvil/AnvilChunk.java b/anvil-loader/src/main/java/mc/world/anvil/AnvilChunk.java
index 77426b4..a0a985d 100644
--- a/anvil-loader/src/main/java/mc/world/anvil/AnvilChunk.java
+++ b/anvil-loader/src/main/java/mc/world/anvil/AnvilChunk.java
@@ -127,7 +127,7 @@ public class AnvilChunk implements Chunk {
 
     @Override
     public Biome getBiome(int x, int z) {
-        return Biome.getById( biomes.get( z << 4 | x) & 255 );
+        return Biome.getById(biomes.get((z >> 4) << 4 | (x >> 4)) & 255);
     }
 
     @Override
diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java
index fe15f98..ea03493 100644
--- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java
+++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java
@@ -169,8 +169,8 @@ public class ChunkDataPacket implements SCPacket {
 
                         if (biomeWrite) {
                             biomes.writeByte(chunk.getBiome(
-                                    chunk.getX() << 4 + x,
-                                    chunk.getZ() << 4 + z
+                                    (chunk.getX() << 4) + x,
+                                    (chunk.getZ() << 4) + z
                             ).getId());
                             if (x == 15 && z == 15) {
                                 biomeWrite = false;