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
This commit is contained in:
Jamie Mansfield 2017-08-09 01:20:45 +01:00
parent 2b302da76c
commit cc7e494098
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 2ae8ba0afc68215d4c702067d13abdd62a774539
Subproject commit da88d5c50263517b4bca8d4aa9bcfcf637876b0b

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

@ -1,4 +1,4 @@
From ee9913c20e8a472b4f38d515d2aff5278f4de225 Mon Sep 17 00:00:00 2001
From 309ca033db547d40909d8fb041ed5a8eaffe0a2d 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,10 +56,10 @@ index 111ee8b4..fcb3dc0d 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 57fe06e5..4299bc7a 100644
index 4049e815..1010f361 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
@@ -241,7 +241,7 @@ public class DownstreamBridge extends PacketHandler
@@ -240,7 +240,7 @@ public class DownstreamBridge extends PacketHandler
brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );

6
BungeeCord-Patches/0009-Allow-configuration-of-the-log-file-path-filename.patch
View File

@ -1,11 +1,11 @@
From 14a65cdadacf3f26e2d8e0bd38b5aa6b431de19e Mon Sep 17 00:00:00 2001
From b9149ce0beebd9174c06dc7ac6eb3b44b0c3420a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 11 Sep 2015 23:50:52 -0400
Subject: [PATCH] Allow configuration of the log file path/filename
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index fbec9e86..9b07c805 100644
index 66463ec5..2b17e7a7 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -211,7 +211,7 @@ public class BungeeCord extends ProxyServer
@ -18,5 +18,5 @@ index fbec9e86..9b07c805 100644
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
--
2.12.0
2.13.4

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

@ -1,4 +1,4 @@
From 3db58d4b09ae6d1d289033f12cf8e40ccf9eeaf4 Mon Sep 17 00:00:00 2001
From 4e46f524eabfc3189e11bca8bd98c3a83093c0a4 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.12.0
2.13.4

10
BungeeCord-Patches/0017-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From fe6f72f9e06cf8662a4b27fc9ffa6369c1aa7ad5 Mon Sep 17 00:00:00 2001
From d1348d290d22ea00539c69005a6bd9d56f7437ca Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 18:05:33 -0600
Subject: [PATCH] Micro-optimizations
@ -46,7 +46,7 @@ index 34e3c3e3..93dd74ee 100644
{
}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index f28e7182..a70ac2c9 100644
index c5d69ee5..50617642 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -548,7 +548,7 @@ public final class UserConnection implements ProxiedPlayer
@ -59,10 +59,10 @@ index f28e7182..a70ac2c9 100644
@Override
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 4299bc7a..dc780634 100644
index 1010f361..2a2b9d8c 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
@@ -223,7 +223,6 @@ public class DownstreamBridge extends PacketHandler
@@ -222,7 +222,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -70,7 +70,7 @@ index 4299bc7a..dc780634 100644
PluginMessageEvent event = new PluginMessageEvent( con.getServer(), con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -250,6 +249,7 @@ public class DownstreamBridge extends PacketHandler
@@ -249,6 +248,7 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{

8
BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From c41a2ef38bd0f0d82d9d6ca78e721cd0cd28ea67 Mon Sep 17 00:00:00 2001
From 43f95c473f5fd5e57755f33d41349fa2a759be72 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Optional server list ping logging.
@ -73,10 +73,10 @@ index dc5b82e2..f8532dc2 100644
}
}
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 dc780634..e48ebc0f 100644
index 2a2b9d8c..c2e751be 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
@@ -511,6 +511,6 @@ public class DownstreamBridge extends PacketHandler
@@ -510,6 +510,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -85,7 +85,7 @@ index dc780634..e48ebc0f 100644
}
}
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 289fdf67..ded09742 100644
index 5e7f3232..dd98b37e 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
@@ -282,19 +282,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection

10
BungeeCord-Patches/0034-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From 623bf49248ff747e68d338d7a45c5b0fff5a1a5f Mon Sep 17 00:00:00 2001
From 348778a0921761d2b7f02f8869cca9cea097d3dd Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent
@ -75,10 +75,10 @@ index f8532dc2..c447524e 100644
{
// Pre cancel the event if we are going to try another server
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 e48ebc0f..1339373d 100644
index c2e751be..62d982a4 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
@@ -60,16 +60,19 @@ public class DownstreamBridge extends PacketHandler
@@ -59,16 +59,19 @@ public class DownstreamBridge extends PacketHandler
return;
}
@ -103,7 +103,7 @@ index e48ebc0f..1339373d 100644
}
@Override
@@ -84,7 +87,19 @@ public class DownstreamBridge extends PacketHandler
@@ -83,7 +86,19 @@ public class DownstreamBridge extends PacketHandler
if ( !server.isObsolete() )
{
@ -124,7 +124,7 @@ index e48ebc0f..1339373d 100644
}
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -455,7 +470,11 @@ public class DownstreamBridge extends PacketHandler
@@ -454,7 +469,11 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );

10
BungeeCord-Patches/0039-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From b0a4650c261121b225ab7b4955f77848165da135 Mon Sep 17 00:00:00 2001
From 8550aafdc7f84fbf9909d2dea105564b369eb2f1 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -163,7 +163,7 @@ index 00000000..7ed2dc3a
+ }
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 8a15f59c..5831514e 100644
index 3e8e2170..a3201946 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -2,7 +2,9 @@ package net.md_5.bungee;
@ -188,10 +188,10 @@ index 8a15f59c..5831514e 100644
@Getter
private String displayName;
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 1339373d..2cf4bef7 100644
index 62d982a4..2e2d5d20 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
@@ -31,6 +31,8 @@ import net.md_5.bungee.netty.PacketHandler;
@@ -30,6 +30,8 @@ import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.packet.BossBar;
@ -200,7 +200,7 @@ index 1339373d..2cf4bef7 100644
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.PlayerListItem;
import net.md_5.bungee.protocol.packet.Respawn;
@@ -521,6 +523,32 @@ public class DownstreamBridge extends PacketHandler
@@ -520,6 +522,32 @@ public class DownstreamBridge extends PacketHandler
}
}