From 1bf49b1f0b0634fb89e2cf7c0bf524a65ee20fdd Mon Sep 17 00:00:00 2001 From: Mats Date: Thu, 3 Mar 2016 12:18:23 +0100 Subject: [PATCH 1/4] Fix unmount --- .../transformers/OutgoingTransformer.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java index 8957365f7..667d50be3 100644 --- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java +++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java @@ -34,6 +34,7 @@ public class OutgoingTransformer { private boolean cancel = false; private Map uuidMap = new HashMap(); private Map clientEntityTypes = new HashMap(); + private Map vehicleMap = new HashMap<>(); public OutgoingTransformer(ConnectionInfo info) { this.info = info; @@ -82,8 +83,17 @@ public class OutgoingTransformer { if (!lead) { output.clear(); writeVarInt(PacketType.PLAY_SET_PASSENGERS.getNewPacketID(), output); - writeVarInt(vehicle, output); - writeVarIntArray(Collections.singletonList(passenger), output); + if (vehicle == -1) { + if (!vehicleMap.containsKey(passenger)) + throw new CancelException(); + vehicle = vehicleMap.remove(passenger); + writeVarInt(vehicle,output); + writeVarIntArray(Collections.emptyList(), output); + } else{ + writeVarInt(vehicle, output); + writeVarIntArray(Collections.singletonList(passenger), output); + vehicleMap.put(passenger,vehicle); + } return; } output.writeInt(passenger); From e1ba6e07c2969e2a0404ed69fde625034450e31a Mon Sep 17 00:00:00 2001 From: HugoDaBosss Date: Thu, 3 Mar 2016 12:20:19 +0100 Subject: [PATCH 2/4] Fix animals appearing as babies instead of parent --- .../java/us/myles/ViaVersion/metadata/MetadataRewriter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java b/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java index 7a4d6770d..93d307303 100644 --- a/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java +++ b/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java @@ -86,7 +86,10 @@ public class MetadataRewriter { PacketUtil.writeString((String) value, output); break; case Boolean: - output.writeBoolean(((Byte) value).byteValue() != 0); + if(metaIndex == MetaIndex.AGEABLE_AGE) + output.writeBoolean(((Byte) value).byteValue() < 0); + else + output.writeBoolean(((Byte) value).byteValue() != 0); break; case Slot: PacketUtil.writeItem(value, output); From cc813545d8774bfc44c39e3715b63cda5c565b21 Mon Sep 17 00:00:00 2001 From: HugoDaBosss Date: Thu, 3 Mar 2016 12:22:54 +0100 Subject: [PATCH 3/4] Formatting --- .../us/myles/ViaVersion/metadata/MetadataRewriter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java b/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java index 93d307303..1dad62f05 100644 --- a/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java +++ b/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java @@ -86,10 +86,10 @@ public class MetadataRewriter { PacketUtil.writeString((String) value, output); break; case Boolean: - if(metaIndex == MetaIndex.AGEABLE_AGE) - output.writeBoolean(((Byte) value).byteValue() < 0); - else - output.writeBoolean(((Byte) value).byteValue() != 0); + if(metaIndex == MetaIndex.AGEABLE_AGE) + output.writeBoolean(((Byte) value).byteValue() < 0); + else + output.writeBoolean(((Byte) value).byteValue() != 0); break; case Slot: PacketUtil.writeItem(value, output); From fd0bd53826b9e077492ea38cc0bce1f4f07df91f Mon Sep 17 00:00:00 2001 From: Myles Date: Thu, 3 Mar 2016 13:07:57 +0000 Subject: [PATCH 4/4] Bump version to 0.4.6 --- README.md | 2 +- src/main/resources/plugin.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d45e9ae53..1e9b8b404 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ViaVersion 0.4.5 +# ViaVersion 0.4.6 **Allows the connection of 1.8 clients to 1.9** This plugin modifies netty to allow connection of 1.9 clients to 1.8, diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 59982eef5..3f3eaa8a2 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: ViaVersion main: us.myles.ViaVersion.ViaVersionPlugin author: _MylesC -version: 0.4.5 +version: 0.4.6 load: startup loadbefore: [ProtocolLib, ProxyPipe] \ No newline at end of file