From f0da0624f7e0e7fb3ddcbdb4756f5090de9d0b44 Mon Sep 17 00:00:00 2001 From: Nassim <28825609+KennyTV@users.noreply.github.com> Date: Mon, 23 Sep 2019 10:00:03 +0200 Subject: [PATCH] Fix villager and llama meta rewrites (#146) --- .../protocol1_10to1_11/packets/EntityPackets1_11.java | 6 +++--- .../protocol1_13_2to1_14/packets/EntityPackets1_14.java | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java index ccbff19c..c60a901e 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java @@ -509,9 +509,6 @@ public class EntityPackets1_11 extends EntityRewriter { return e.getData(); }); - // Handle Horse (Correct owner) - registerMetaHandler().filter(EntityType.ABSTRACT_HORSE, true, 14).handleIndexChange(16); - // Handle horse armor registerMetaHandler().filter(EntityType.HORSE, 16).handleIndexChange(17); @@ -545,6 +542,9 @@ public class EntityPackets1_11 extends EntityRewriter { return e.getData(); }); + // Handle Horse (Correct owner) + registerMetaHandler().filter(EntityType.ABSTRACT_HORSE, true, 14).handleIndexChange(16); + // Handle villager - Change non-existing profession registerMetaHandler().filter(EntityType.VILLAGER, 13).handle(e -> { Metadata data = e.getData(); 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 9415f9fc..89aa5831 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 @@ -444,16 +444,21 @@ public class EntityPackets1_14 extends EntityRewriter { return meta; }); + registerMetaHandler().filter(EntityType1_14.EntityType.VILLAGER, 15).removed(); // Head shake timer + MetaHandler villagerDataHandler = e -> { Metadata meta = e.getData(); VillagerData villagerData = (VillagerData) meta.getValue(); meta.setValue(villagerDataToProfession(villagerData)); meta.setMetaType(MetaType1_13_2.VarInt); + if (meta.getId() == 16) { + meta.setId(15); // decreased by 2 again in one of the following handlers + } return meta; }; registerMetaHandler().filter(EntityType1_14.EntityType.ZOMBIE_VILLAGER, 18).handle(villagerDataHandler); - registerMetaHandler().filter(EntityType1_14.EntityType.VILLAGER, 15).handle(villagerDataHandler); + registerMetaHandler().filter(EntityType1_14.EntityType.VILLAGER, 16).handle(villagerDataHandler); registerMetaHandler().filter(EntityType1_14.EntityType.ZOMBIE, true).handle(e -> { Metadata meta = e.getData();