From e8da5554dc1a5c52b82d10d71dee43409b3b0cb7 Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Thu, 21 Jan 2021 11:42:09 +0100
Subject: [PATCH] Handle shulker meta index change

---
 .../protocol1_16_4to1_17/packets/EntityPackets1_17.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
index c394c23e..5266361b 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
@@ -111,6 +111,13 @@ public class EntityPackets1_17 extends EntityRewriter<Protocol1_16_4To1_17> {
         mapEntity(Entity1_17Types.EntityType.GLOW_SQUID, Entity1_17Types.EntityType.SQUID).jsonName("Glow Squid");
         mapEntity(Entity1_17Types.EntityType.GLOW_ITEM_FRAME, Entity1_17Types.EntityType.ITEM_FRAME);
 
+        registerMetaHandler().filter(Entity1_17Types.EntityType.SHULKER).handle(meta -> {
+            if (meta.getIndex() >= 17) {
+                meta.getData().setId(meta.getIndex() + 1); // TODO Handle attachment pos?
+            }
+            return meta.getData();
+        });
+
         registerMetaHandler().filter(7).removed(); // Ticks frozen
         registerMetaHandler().handle(meta -> {
             if (meta.getIndex() > 7) {