Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 13:15:31 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
9bce8370 #2622: Let ThrottleTest work independently of real time
191afb6a Minecraft 1.14 support
This commit is contained in:
Shane Freeder 2019-04-26 03:20:17 +01:00
parent 2ebd83868a
commit 8974fb3b97
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 4ca942b169292591bc0dcea9d4d6772188bcf077
Subproject commit 9bce83704ade428c64b19302c470e2f4b356f204

22
BungeeCord-Patches/0054-TEMP-1.14-version-bump.patch
View File

@ -1,22 +0,0 @@
From 54ceab1968c1a8ce967d57bdd8edd409167f1464 Mon Sep 17 00:00:00 2001
From: Colin Godsey <crgodsey@gmail.com>
Date: Tue, 23 Apr 2019 11:18:07 -0600
Subject: [PATCH] TEMP 1.14 version bump
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 fb583238..a0c0b5ca 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
@@ -20,7 +20,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_13 = 393;
public static final int MINECRAFT_1_13_1 = 401;
public static final int MINECRAFT_1_13_2 = 404;
- public static final int MINECRAFT_1_14 = 476;
+ public static final int MINECRAFT_1_14 = 477;
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
"1.8.x",
"1.9.x",
--
2.21.0