Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-28 03:27:37 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Waterfall)

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

Waterfall Changes:
154eb18 Bring up waterfall to 1.14 release
This commit is contained in:
Shane Freeder 2019-04-23 18:57:42 +01:00
parent 3d9d600164
commit 29deb8df30
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 69d0c4010d265918b8f1ae62fae99babc2058ce2 Subproject commit 154eb184b6e74c6a6f3f98cf180f7db96d8f7f10

6
Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From 9e835b90ac238b415a33770923b49446999f9385 Mon Sep 17 00:00:00 2001 From 83f505362db5c470582941de59a0ccff3c40c80f Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 10:31:04 -0500 Date: Tue, 15 Nov 2016 10:31:04 -0500
Subject: [PATCH] 1.7.x Protocol Patch Subject: [PATCH] 1.7.x Protocol Patch
@ -445,7 +445,7 @@ index 3a319cff..6ccfdcf1 100644
Constructor<? extends DefinedPacket> constructor = protocolData.packetConstructors[id]; Constructor<? extends DefinedPacket> constructor = protocolData.packetConstructors[id];
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 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..67c3ef1e 100644 index a0c0b5ca..4c3df5fb 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -6,6 +6,8 @@ import java.util.List; @@ -6,6 +6,8 @@ import java.util.List;
@ -459,7 +459,7 @@ index fb583238..67c3ef1e 100644
public static final int MINECRAFT_1_9_1 = 108; public static final int MINECRAFT_1_9_1 = 108;
@@ -22,6 +24,7 @@ public class ProtocolConstants @@ -22,6 +24,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_13_2 = 404; 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( public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
+ "1.7.x", + "1.7.x",
"1.8.x", "1.8.x",