From 19d86058f9bf77ee2b574297f6485cfa4da29d95 Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 21 May 2019 22:07:43 +0200 Subject: [PATCH] add entity remaps --- .../protocol1_13_2to1_14/packets/EntityPackets1_14.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 c7e154dc..18139b24 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 @@ -18,6 +18,7 @@ import us.myles.ViaVersion.api.minecraft.item.Item; import us.myles.ViaVersion.api.minecraft.metadata.MetaType; import us.myles.ViaVersion.api.minecraft.metadata.Metadata; import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13_2; +import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_14; import us.myles.ViaVersion.api.remapper.PacketHandler; import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.type.Type; @@ -295,6 +296,8 @@ public class EntityPackets1_14 extends EntityRewriter { regEntType(EntityType1_14.EntityType.TRADER_LLAMA, EntityType1_14.EntityType.LLAMA).mobName("Trader Llama"); regEntType(EntityType1_14.EntityType.FOX, EntityType1_14.EntityType.WOLF).mobName("Fox"); regEntType(EntityType1_14.EntityType.PANDA, EntityType1_14.EntityType.POLAR_BEAR).mobName("Panda"); + regEntType(EntityType1_14.EntityType.PILLAGER, EntityType1_14.EntityType.VILLAGER).mobName("Pillager"); + regEntType(EntityType1_14.EntityType.RAVAGER, EntityType1_14.EntityType.COW).mobName("Ravager"); registerMetaHandler().handle(e -> { Metadata meta = e.getData(); @@ -310,12 +313,14 @@ public class EntityPackets1_14 extends EntityRewriter { meta.setValue(getProtocol().getBlockItemPackets().handleItemToClient(item)); } else if (type == MetaType1_13_2.BlockID) { int blockstate = (Integer) meta.getValue(); - meta.setValue(Protocol1_14To1_13_2.getNewBlockStateId(blockstate)); + meta.setValue(getProtocol().getNewBlockStateId(blockstate)); } return meta; }); + registerMetaHandler().filter(EntityType1_14.EntityType.PILLAGER, 15).removed(); + registerMetaHandler().filter(EntityType1_14.EntityType.FOX, 15).removed(); registerMetaHandler().filter(EntityType1_14.EntityType.FOX, 16).removed(); registerMetaHandler().filter(EntityType1_14.EntityType.FOX, 17).removed();