From 0c040db6f0df4c869025fda495cfa24441cc51a8 Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Thu, 15 Oct 2020 19:17:16 +0200
Subject: [PATCH] Fix NPE in piston remapper Fixes ViaVersion/ViaVersion#2137

---
 .../block_entity_handlers/PistonHandler.java                    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java
index 92f257d7..935479c0 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java
@@ -68,6 +68,8 @@ public class PistonHandler implements BackwardsBlockEntityProvider.BackwardsBloc
     @Override
     public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
         CompoundTag blockState = tag.get("blockState");
+        if (blockState == null) return tag;
+
         String dataFromTag = getDataFromTag(blockState);
         if (dataFromTag == null) return tag;