Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-10-04 01:17:44 +02:00
Code Issues Projects Releases Wiki Activity

forgotten merge conflict

Browse Source
This commit is contained in:
creeper123123321 2019-10-30 14:30:36 -03:00
parent fd065fb7c5
commit ce4ae73f55
No known key found for this signature in database
GPG Key ID: 0AC57D54786721D1
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
View File

@ -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);
}
});
}