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:
6456426 Updated Upstream (BungeeCord)
This commit is contained in:
Shane Freeder 2019-12-21 06:55:31 +00:00
parent fef31958e2
commit 269c5fe534
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 4 additions and 4 deletions

@ -1 +1 @@
Subproject commit 487b6320537e4f64f867f998c4db3d8dffa31ae1
Subproject commit 6456426ebdf5c4ad3b32a8954607892e70139e63

View File

@ -1,4 +1,4 @@
From 6d405b6c9b3d6a5ba27bd85be0f33bc52043cf85 Mon Sep 17 00:00:00 2001
From 14872d06fc7e7870c466226954c3da65c02ea91e 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
@ -1642,10 +1642,10 @@ index 51d0c6cf..35b9530a 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 066135ad..08db1f17 100644
index af27f65c..67985446 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
@@ -35,6 +35,10 @@ public abstract class EntityMap
@@ -34,6 +34,10 @@ public abstract class EntityMap
// Waterfall end
switch ( version )
{