From d99c5f5e6067de47137bd4dcea24c1951f6221a9 Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Thu, 7 Mar 2019 12:11:04 -0300
Subject: [PATCH] metadata

---
 .../packets/EntityPackets1_14.java                  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
index 6045e21b..5c6f2952 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
@@ -4,7 +4,6 @@ import nl.matsv.viabackwards.ViaBackwards;
 import nl.matsv.viabackwards.api.entities.storage.EntityData;
 import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
 import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
-import nl.matsv.viabackwards.api.entities.types.EntityType1_12;
 import nl.matsv.viabackwards.api.entities.types.EntityType1_13;
 import nl.matsv.viabackwards.api.entities.types.EntityType1_14;
 import nl.matsv.viabackwards.api.rewriters.EntityRewriter;
@@ -277,18 +276,18 @@ public class EntityPackets1_14 extends EntityRewriter<Protocol1_13_2To1_14> {
             }
             return e.getData();
         });
-        // Remove entity pose
-        registerMetaHandler().filter(EntityType1_14.EntityType.ENTITY, true, 6).removed();
-        registerMetaHandler().filter(EntityType1_14.EntityType.ENTITY, true).handle(e -> {
-            if (e.getIndex() > 6) e.getData().setId(e.getIndex() - 1);
-            return e.getData();
-        });
         // Remove bed location - todo send sleep packet
         registerMetaHandler().filter(EntityType1_14.EntityType.LIVINGENTITY, true, 12).removed();
         registerMetaHandler().filter(EntityType1_14.EntityType.LIVINGENTITY, true).handle(e -> {
             if (e.getIndex() > 12) e.getData().setId(e.getIndex() - 1);
             return e.getData();
         });
+        // Remove entity pose
+        registerMetaHandler().filter(EntityType1_14.EntityType.ENTITY, true, 6).removed();
+        registerMetaHandler().filter(EntityType1_14.EntityType.ENTITY, true).handle(e -> {
+            if (e.getIndex() > 6) e.getData().setId(e.getIndex() - 1);
+            return e.getData();
+        });
         registerMetaHandler().filter(EntityType1_14.EntityType.CAT, 13).removed();
         registerMetaHandler().filter(EntityType1_14.EntityType.CAT, 14).removed();
         registerMetaHandler().filter(EntityType1_14.EntityType.CAT, 15).removed();