mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-12-27 11:07:39 +01:00
Updated Upstream (Waterfall)
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:
e10d558
Updated Upstream (BungeeCord)
This commit is contained in:
parent
25970ec20f
commit
3592041eaa
@ -1 +1 @@
|
||||
Subproject commit 6f3e7d0d4d3d9c2b9f4433c8cf104b713f9a29c0
|
||||
Subproject commit e10d558b8b8a8156733df8f81775dee704e06072
|
@ -1,4 +1,4 @@
|
||||
From 7d9f24fc87def61c64d746725ec5980030d32b33 Mon Sep 17 00:00:00 2001
|
||||
From a5bb288119b2c45e460c6ece1c24d37e0924d925 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
|
||||
@ -1353,7 +1353,7 @@ index 491cf1a1..299a216c 100644
|
||||
}
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
||||
index 858b3ae6..49233a86 100644
|
||||
index 35a19224..53ef99cd 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
||||
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufAllocator;
|
||||
@ -1398,7 +1398,7 @@ index 858b3ae6..49233a86 100644
|
||||
}
|
||||
for ( Score score : serverScoreboard.getScores() )
|
||||
{
|
||||
@@ -432,6 +443,14 @@ public class ServerConnector extends PacketHandler
|
||||
@@ -433,6 +444,14 @@ public class ServerConnector extends PacketHandler
|
||||
{
|
||||
this.handshakeHandler.handle( pluginMessage );
|
||||
|
||||
@ -2004,5 +2004,5 @@ index daf12f74..e33861ab 100644
|
||||
|
||||
@Override
|
||||
--
|
||||
2.25.0
|
||||
2.26.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user