Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-27 11:07:39 +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:
ffe3d76 Updated Upstream (BungeeCord)
This commit is contained in:
Aikar 2020-05-09 21:54:00 -04:00
parent 477244f6d9
commit 8f114f3003
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 2cab85cbef7cefc63bb19ddbeb6d1bea3514a46c
Subproject commit ffe3d76ee6a89e4c8a7708eafdc3a148b341f51d

12
Waterfall-Proxy-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 919f1ead07b7e2f9a82129b55373f88a278860e8 Mon Sep 17 00:00:00 2001
From 3a683289d2b30883aafa06304a847bd0fc0630b5 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 08:56:43 -0500
Subject: [PATCH] POM Changes
@ -450,7 +450,7 @@ index f8b549dc..b4459ace 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 37bdaf3d..047bc3de 100644
index c9531d39..8b05cec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,19 +5,19 @@
@ -538,7 +538,7 @@ index 4592e2b3..0501a835 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 54500dde..43c334db 100644
index 0341a6bc..b95c4b72 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -5,17 +5,17 @@
@ -562,7 +562,7 @@ index 54500dde..43c334db 100644
<description>Proxy component of the Elastic Portal Suite</description>
<properties>
@@ -42,14 +42,14 @@
@@ -36,14 +36,14 @@
<version>${netty.version}</version>
<scope>compile</scope>
</dependency>
@ -579,7 +579,7 @@ index 54500dde..43c334db 100644
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
@@ -65,31 +65,31 @@
@@ -59,31 +59,31 @@
</dependency>
<dependency>
<groupId>io.github.waterfallmc</groupId>
@ -666,5 +666,5 @@ index c3a29122..109574c0 100644
<scope>compile</scope>
</dependency>
--
2.25.0
2.26.2

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

@ -1,4 +1,4 @@
From e0c2ad90e1c91d7d950d85ceab8b9f5e3f2adf9d Mon Sep 17 00:00:00 2001
From 85fab59576a386bb89c27c7dbdf9269b94ff1831 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 10:31:04 -0500
Subject: [PATCH] 1.7.x Protocol Patch
@ -1127,7 +1127,7 @@ index 0b27fc86..74066702 100644
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
index d6865ae2..01e38206 100644
index fca4c5d2..25d16751 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
@@ -1,5 +1,6 @@
@ -1530,7 +1530,7 @@ index d7d0fafc..21597768 100644
con.unsafe().sendPacket( pluginMessage );
throw CancelSendSignal.INSTANCE;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 007d3daf..87f4bf12 100644
index 37ea35e3..b1c37a55 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -12,6 +12,13 @@ import java.util.List;
@ -1635,10 +1635,10 @@ index 4d8bac5d..359c90e0 100644
con.getServer().disconnect( "Quitting" );
}
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 e6afb98d..b1da3605 100644
index bc1de55a..73b05167 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
@@ -34,6 +34,10 @@ public abstract class EntityMap
@@ -35,6 +35,10 @@ public abstract class EntityMap
// Waterfall end
switch ( version )
{
@ -2004,5 +2004,5 @@ index daf12f74..e33861ab 100644
@Override
--
2.26.1
2.26.2