Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-07-20 11:04:49 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1210 from KennyTV/dev

Browse Source 
Fix minecart data
This commit is contained in:
Myles 2019-03-04 15:46:27 +00:00 committed by GitHub
commit 1cdfeadd86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
View File

@ -57,6 +57,29 @@ public class EntityPackets {
if (type1_14.is(Entity1_14Types.EntityType.FALLING_BLOCK)) {
int data = wrapper.get(Type.INT, 0);
wrapper.set(Type.INT, 0, Protocol1_14To1_13_2.getNewBlockStateId(data));
} else if (type1_14.is(Entity1_14Types.EntityType.MINECART)) {
int data = wrapper.get(Type.INT, 0);
// default is 0 = rideable minecart
switch (data) {
case 1:
typeId = Entity1_14Types.EntityType.CHEST_MINECART.getId();
break;
case 2:
typeId = Entity1_14Types.EntityType.FURNACE_MINECART.getId();
break;
case 3:
typeId = Entity1_14Types.EntityType.TNT_MINECART.getId();
break;
case 4:
typeId = Entity1_14Types.EntityType.SPAWNER_MINECART.getId();
break;
case 5:
typeId = Entity1_14Types.EntityType.HOPPER_MINECART.getId();
break;
case 6:
typeId = Entity1_14Types.EntityType.COMMANDBLOCK_MINECART.getId();
break;
}
}
}
@ -162,8 +185,8 @@ public class EntityPackets {
metadataPacket.write(Type.VAR_INT, wrapper.get(Type.VAR_INT, 0));
List<Metadata> metadataList = new LinkedList<>();
metadataList.add(new Metadata(12, MetaType1_14.OptPosition, null));
metadataPacket.write(Types1_14.METADATA_LIST, metadataList);
metadataPacket.send(Protocol1_14To1_13_2.class);
metadataPacket.write(Types1_14.METADATA_LIST, metadataList);
metadataPacket.send(Protocol1_14To1_13_2.class);
}
}
});