From d1a1e87ab58a2c3fe20742f13c9582d1e7fc845f Mon Sep 17 00:00:00 2001 From: Thinkofname Date: Wed, 30 Mar 2016 16:57:54 +0100 Subject: [PATCH] Support Minecraft 1.9.2 --- .../src/main/java/net/md_5/bungee/protocol/Protocol.java | 5 ++++- .../java/net/md_5/bungee/protocol/ProtocolConstants.java | 4 ++-- proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java index 8338d239..6b68e7f1 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java @@ -109,7 +109,8 @@ public enum Protocol public static List supportedVersions = Arrays.asList( ProtocolConstants.MINECRAFT_1_8, ProtocolConstants.MINECRAFT_1_9, - ProtocolConstants.MINECRAFT_1_9_1 + ProtocolConstants.MINECRAFT_1_9_1, + ProtocolConstants.MINECRAFT_1_9_2 ); /*========================================================================*/ public final DirectionData TO_SERVER = new DirectionData( ProtocolConstants.Direction.TO_SERVER ); @@ -136,6 +137,8 @@ public enum Protocol packetRemapInv.put( ProtocolConstants.MINECRAFT_1_9, new TIntIntHashMap() ); packetRemap.put( ProtocolConstants.MINECRAFT_1_9_1, packetRemap.get( ProtocolConstants.MINECRAFT_1_9 ) ); packetRemapInv.put( ProtocolConstants.MINECRAFT_1_9_1, packetRemapInv.get( ProtocolConstants.MINECRAFT_1_9 ) ); + packetRemap.put( ProtocolConstants.MINECRAFT_1_9_2, packetRemap.get( ProtocolConstants.MINECRAFT_1_9 ) ); + packetRemapInv.put( ProtocolConstants.MINECRAFT_1_9_2, packetRemapInv.get( ProtocolConstants.MINECRAFT_1_9 ) ); } public final DefinedPacket createPacket(int id, int protocol) diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java index 6f6f3e3c..4b6d9fa1 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java @@ -9,10 +9,10 @@ public class ProtocolConstants public static final int MINECRAFT_1_8 = 47; public static final int MINECRAFT_1_9 = 107; public static final int MINECRAFT_1_9_1 = 108; + public static final int MINECRAFT_1_9_2 = 109; public static final List SUPPORTED_VERSIONS = Arrays.asList( "1.8.x", - "1.9", - "1.9.1" + "1.9.x" ); public enum Direction diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java index 321668bc..51ef928b 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java @@ -29,6 +29,7 @@ public abstract class EntityMap return EntityMap_1_8.INSTANCE; case ProtocolConstants.MINECRAFT_1_9: case ProtocolConstants.MINECRAFT_1_9_1: + case ProtocolConstants.MINECRAFT_1_9_2: return EntityMap_1_9.INSTANCE; } throw new RuntimeException( "Version " + version + " has no entity map" );