Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-06-26 14:35:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source 
bungeecord-ref: dda0638869
This commit is contained in:
Jamie Mansfield 2017-12-30 21:57:10 +00:00
parent 1ef166d6a9
commit b477eba646
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 9fd98436afcb6e504ed24c94997ee3c2aaa4bcfe
Subproject commit dda06388692fa199c149a4fdab238fb5d04a7ebf

6
BungeeCord-Patches/0008-Don-t-access-a-ByteBuf-s-underlying-array.patch
View File

@ -1,4 +1,4 @@
From 55d79ca12bc3bbab71449754efcb268d8d7f9781 Mon Sep 17 00:00:00 2001
From ae3d646da41f223ab8f1b866b7e773ac73d527ff Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -56,7 +56,7 @@ index 6c31f15f..4a96a601 100644
user.setDimension( login.getDimension() );
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 6b8ae245..a92b806c 100644
index 6b912ac7..95b547b3 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -240,7 +240,7 @@ public class DownstreamBridge extends PacketHandler
@ -86,5 +86,5 @@ index 551ae1e1..be9685b9 100644
{
@Override
--
2.14.1
2.14.3

4
BungeeCord-Patches/0009-Fix-unicode-characters-in-configuration-files.patch
View File

@ -1,4 +1,4 @@
From a0a5c4270f1529e454c7b0f817ebdab7b17cb5d3 Mon Sep 17 00:00:00 2001
From a66db9be317a66333b470b91eeaeac13b4d7264c Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Sat, 21 May 2016 17:17:36 -0600
Subject: [PATCH] Fix unicode characters in configuration files
@ -53,5 +53,5 @@ index db8aa4be..9258d7dd 100644
return load( reader, defaults );
}
--
2.14.1
2.14.3

4
BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
View File

@ -1,4 +1,4 @@
From 4b35ef1339fb251cce0fd413768b5b21a43d0d93 Mon Sep 17 00:00:00 2001
From a7d849a2666501db7513a79a0fba9d7d6b7bd278 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions
@ -271,5 +271,5 @@ index e596f822..2f0cd28d 100644
@Override
--
2.14.1
2.14.3

2
BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch
View File

@ -1,4 +1,4 @@
From 1829e8a96a90d7600af62285564eba17604afcb4 Mon Sep 17 00:00:00 2001
From 81d0178ac2014c4289c0511cd919afc02d9bfe85 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled

4
BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
View File

@ -1,4 +1,4 @@
From 7415b8f4ad505083d9dc0daa08dbc9d4601af26e Mon Sep 17 00:00:00 2001
From 6faee71d0df54f06ac032590ffc4c98bc65dabde Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API
@ -75,5 +75,5 @@ index 3d9396d3..c1afa6da 100644
public void testLoopSimple()
{
--
2.14.1
2.14.3