From ce4ae73f5559a6ddc54db13b0c954ef0bac68221 Mon Sep 17 00:00:00 2001 From: creeper123123321 Date: Wed, 30 Oct 2019 14:30:36 -0300 Subject: [PATCH] forgotten merge conflict --- .../packets/EntityPackets.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java index 3c20fc1a4..b91f6ad13 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java @@ -106,22 +106,8 @@ public class EntityPackets { public void handle(PacketWrapper wrapper) throws Exception { int entityId = wrapper.get(Type.VAR_INT, 0); -<<<<<<< HEAD - int typeId = wrapper.read(Type.VAR_INT); - Entity1_15Types.EntityType entityType = Entity1_15Types.getTypeFromId(getNewEntityId(typeId)); - wrapper.user().get(EntityTracker1_15.class).addEntity(entityId, entityType); - wrapper.write(Type.VAR_INT, entityType.getId()); - - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.BYTE); - wrapper.passthrough(Type.BYTE); - wrapper.read(Types1_14.METADATA); // removed - probably sent in an update packet? -======= Entity1_15Types.EntityType entityType = Entity1_15Types.EntityType.PLAYER; - wrapper.user().get(EntityTracker.class).addEntity(entityId, entityType); ->>>>>>> upstream/dev + wrapper.user().get(EntityTracker1_15.class).addEntity(entityId, entityType); } }); }