Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-12-26 10:37:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix handling of Title packet for 1.11 and maintain backwards compat with 1.10 and earlier

Browse Source
This commit is contained in:
Shane 2016-11-14 19:27:44 +00:00 committed by md_5
parent 9ecdde2292
commit 95a269df7a
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
protocol/src/main/java/net/md_5/bungee/protocol/packet/Title.java
View File

@ -28,11 +28,20 @@ public class Title extends DefinedPacket
@Override @Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{ {
action = Action.values()[readVarInt( buf )]; int index = readVarInt( buf );
// If we're working on 1.10 or lower, increment the value of the index so we pull out the correct value.
if ( protocolVersion <= ProtocolConstants.MINECRAFT_1_10 && index <= 2 )
{
index++;
}
action = Action.values()[index];
switch ( action ) switch ( action )
{ {
case TITLE: case TITLE:
case SUBTITLE: case SUBTITLE:
case ACTIONBAR:
text = readString( buf ); text = readString( buf );
break; break;
case TIMES: case TIMES:
@ -46,11 +55,20 @@ public class Title extends DefinedPacket
@Override @Override
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{ {
writeVarInt( action.ordinal(), buf ); int index = readVarInt( buf );
// If we're working on 1.10 or lower, increment the value of the index so we pull out the correct value.
if ( protocolVersion <= ProtocolConstants.MINECRAFT_1_10 && index <= 2 )
{
index++;
}
action = Action.values()[index];
switch ( action ) switch ( action )
{ {
case TITLE: case TITLE:
case SUBTITLE: case SUBTITLE:
case ACTIONBAR:
writeString( text, buf ); writeString( text, buf );
break; break;
case TIMES: case TIMES:
@ -72,6 +90,7 @@ public class Title extends DefinedPacket
TITLE, TITLE,
SUBTITLE, SUBTITLE,
ACTIONBAR,
TIMES, TIMES,
CLEAR, CLEAR,
RESET RESET