From 10e81041b203e2ac9195d8bb1af770d8fc33ac0e Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 8 Jul 2013 19:53:57 +1000 Subject: [PATCH] Update to 1.6.2 --- .../net/md_5/bungee/protocol/Vanilla.java | 8 +++++-- .../packet/Packet2CEntityProperties.java | 21 ++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Vanilla.java b/protocol/src/main/java/net/md_5/bungee/protocol/Vanilla.java index ad32dda1..bc95e4d5 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Vanilla.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Vanilla.java @@ -29,8 +29,8 @@ import net.md_5.bungee.protocol.skip.PacketReader; public class Vanilla implements Protocol { - public static final byte PROTOCOL_VERSION = 73; - public static final String GAME_VERSION = "1.6.1"; + public static final byte PROTOCOL_VERSION = 74; + public static final String GAME_VERSION = "1.6.2"; @Getter private static final Vanilla instance = new Vanilla(); /*========================================================================*/ @@ -364,6 +364,10 @@ public class Vanilla implements Protocol { INT, SHORT, INT, BYTE, SHORT_BYTE }; + opCodes[0x84] = new OpCode[] + { + BYTE, INT, INT, INT + }; opCodes[0xC3] = new OpCode[] { SHORT, SHORT, INT_BYTE diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Packet2CEntityProperties.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Packet2CEntityProperties.java index 3a253bab..0f8a4ed8 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Packet2CEntityProperties.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Packet2CEntityProperties.java @@ -13,9 +13,6 @@ import lombok.ToString; public class Packet2CEntityProperties extends DefinedPacket { - private int entityId; - private Map data = new HashMap<>(); - public Packet2CEntityProperties() { super( 0x2C ); @@ -24,24 +21,24 @@ public class Packet2CEntityProperties extends DefinedPacket @Override public void read(ByteBuf buf) { - entityId = buf.readInt(); + buf.readInt(); int recordCount = buf.readInt(); for ( int i = 0; i < recordCount; i++ ) { - data.put( readString( buf ), buf.readDouble() ); + readString( buf ); + buf.readDouble(); + short size = buf.readShort(); + for ( short s = 0; s < size; s++ ) + { + buf.skipBytes( 25 ); // long, long, double, byte + } } } @Override public void write(ByteBuf buf) { - buf.writeInt( entityId ); - buf.writeInt( data.size() ); - for ( Map.Entry entry : data.entrySet() ) - { - writeString( entry.getKey(), buf ); - buf.writeDouble( entry.getValue() ); - } + throw new UnsupportedOperationException(); } @Override