mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-12-29 03:57:48 +01:00
44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
From 1d7169e402f64fbb89ff52761b54a9c936225032 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Tue, 17 Dec 2019 14:41:01 +0000
|
|
Subject: [PATCH] 1.15.1 protocol support
|
|
|
|
|
|
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 a3e2379f..aea6dd57 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
|
|
@@ -28,6 +28,7 @@ public class ProtocolConstants
|
|
public static final int MINECRAFT_1_14_3 = 490;
|
|
public static final int MINECRAFT_1_14_4 = 498;
|
|
public static final int MINECRAFT_1_15 = 573;
|
|
+ public static final int MINECRAFT_1_15_1 = 575; // Travertine
|
|
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
|
|
"1.7.x",
|
|
"1.8.x",
|
|
@@ -61,7 +62,8 @@ public class ProtocolConstants
|
|
ProtocolConstants.MINECRAFT_1_14_2,
|
|
ProtocolConstants.MINECRAFT_1_14_3,
|
|
ProtocolConstants.MINECRAFT_1_14_4,
|
|
- ProtocolConstants.MINECRAFT_1_15
|
|
+ ProtocolConstants.MINECRAFT_1_15,
|
|
+ ProtocolConstants.MINECRAFT_1_15_1 // Travertine
|
|
);
|
|
|
|
public static final boolean isBeforeOrEq(int before, int other)
|
|
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 267e8295..08db1f17 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
|
|
@@ -68,6 +68,7 @@ public abstract class EntityMap
|
|
case ProtocolConstants.MINECRAFT_1_14_4:
|
|
return EntityMap_1_14.INSTANCE;
|
|
case ProtocolConstants.MINECRAFT_1_15:
|
|
+ case ProtocolConstants.MINECRAFT_1_15_1:
|
|
return EntityMap_1_15.INSTANCE;
|
|
}
|
|
throw new RuntimeException( "Version " + version + " has no entity map" );
|
|
--
|
|
2.24.1
|
|
|