Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-12-24 17:37:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1230 from creeper123123321/dev2

Browse Source 
read nbt in 1.14 chunk, pose metatype, don't change ping protocol if …
This commit is contained in:
Myles 2019-03-30 14:07:22 +00:00 committed by GitHub
commit c8d1304e7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_14.java
View File

@ -27,6 +27,7 @@ public enum MetaType1_14 implements MetaType {
PARTICLE(15, Protocol1_13_2To1_13_1.PARTICLE_TYPE), PARTICLE(15, Protocol1_13_2To1_13_1.PARTICLE_TYPE),
VillagerData(16, Type.VILLAGER_DATA), VillagerData(16, Type.VILLAGER_DATA),
OptVarInt(17, Type.OPTIONAL_VAR_INT), OptVarInt(17, Type.OPTIONAL_VAR_INT),
Pose(18, Type.VAR_INT),
Discontinued(99, null); Discontinued(99, null);
private final int typeID; private final int typeID;

2
common/src/main/java/us/myles/ViaVersion/protocols/base/BaseProtocol1_7.java
View File

@ -81,7 +81,7 @@ public class BaseProtocol1_7 extends Protocol {
} }
if (protocols != null) { if (protocols != null) {
if (protocolVersion != 9999) { if (protocolVersion == protocol || protocolVersion == 0) {
//Fix ServerListPlus //Fix ServerListPlus
version.addProperty("protocol", info.getProtocolVersion()); version.addProperty("protocol", info.getProtocolVersion());
} }

1
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/types/Chunk1_14Type.java
View File

@ -30,6 +30,7 @@ public class Chunk1_14Type extends PartialType<Chunk, ClientWorld> {
boolean groundUp = input.readBoolean(); boolean groundUp = input.readBoolean();
int primaryBitmask = Type.VAR_INT.read(input); int primaryBitmask = Type.VAR_INT.read(input);
Type.NBT.read(input); // todo save this
Type.VAR_INT.read(input); Type.VAR_INT.read(input);
BitSet usedSections = new BitSet(16); BitSet usedSections = new BitSet(16);