Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-06-27 23:24:47 +02:00
Code Issues Projects Releases Wiki Activity

Minecraft 1.15.2 support

Browse Source
This commit is contained in:
md_5 2020-01-22 08:00:00 +11:00
parent 4bb0fb67a8
commit 129884f44d
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -68,8 +68,8 @@
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<netty.version>4.1.45.Final</netty.version> <netty.version>4.1.45.Final</netty.version>
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
@ -77,13 +77,13 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version> <version>4.13</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>20.0</version> <version>21.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

4
protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
View File

@ -27,6 +27,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_14_4 = 498; public static final int MINECRAFT_1_14_4 = 498;
public static final int MINECRAFT_1_15 = 573; public static final int MINECRAFT_1_15 = 573;
public static final int MINECRAFT_1_15_1 = 575; public static final int MINECRAFT_1_15_1 = 575;
public static final int MINECRAFT_1_15_2 = 578;
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList( public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
"1.8.x", "1.8.x",
"1.9.x", "1.9.x",
@ -58,7 +59,8 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_14_3, ProtocolConstants.MINECRAFT_1_14_3,
ProtocolConstants.MINECRAFT_1_14_4, ProtocolConstants.MINECRAFT_1_14_4,
ProtocolConstants.MINECRAFT_1_15, ProtocolConstants.MINECRAFT_1_15,
ProtocolConstants.MINECRAFT_1_15_1 ProtocolConstants.MINECRAFT_1_15_1,
ProtocolConstants.MINECRAFT_1_15_2
); );
public enum Direction public enum Direction

2
proxy/pom.xml
View File

@ -87,7 +87,7 @@
<dependency> <dependency>
<groupId>net.sf.jopt-simple</groupId> <groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId> <artifactId>jopt-simple</artifactId>
<version>4.9</version> <version>5.0.4</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

11
proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
View File

@ -58,6 +58,7 @@ public abstract class EntityMap
return EntityMap_1_14.INSTANCE; return EntityMap_1_14.INSTANCE;
case ProtocolConstants.MINECRAFT_1_15: case ProtocolConstants.MINECRAFT_1_15:
case ProtocolConstants.MINECRAFT_1_15_1: case ProtocolConstants.MINECRAFT_1_15_1:
case ProtocolConstants.MINECRAFT_1_15_2:
return EntityMap_1_15.INSTANCE; return EntityMap_1_15.INSTANCE;
} }
throw new RuntimeException( "Version " + version + " has no entity map" ); throw new RuntimeException( "Version " + version + " has no entity map" );
@ -254,11 +255,11 @@ public abstract class EntityMap
try try
{ {
new NBTInputStream( new ByteBufInputStream( packet ), false ).readTag(); new NBTInputStream( new ByteBufInputStream( packet ), false ).readTag();
} catch ( IOException ex ) } catch ( IOException ex )
{ {
throw new RuntimeException( ex ); throw new RuntimeException( ex );
} }
break; break;
case 15: case 15:
DefinedPacket.readVarInt( packet ); DefinedPacket.readVarInt( packet );
DefinedPacket.readVarInt( packet ); DefinedPacket.readVarInt( packet );