Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-10-01 07:57:31 +02:00
Code Issues Projects Releases Wiki Activity

Update BungeeCord

Browse Source
This commit is contained in:
Shane Freeder 2019-01-31 22:24:13 +00:00
parent 178c3a1de5
commit 7dd259045b
10 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 7496b0a2c8b7be45c5414b87abde4a1e9b995948
Subproject commit 0dd538f9ff77c20da72c4530b3d21633799bc3a5

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

@ -1,4 +1,4 @@
From c0816a3c82b0eef1e18ff3b8ffd735dac3aa0968 Mon Sep 17 00:00:00 2001
From 8357712a235f24756ecd7f7f823fe41fc3c2e0e3 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 177b7389..00a1988b 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 25b81722..1693f42b 100644
index 75aebc65..277422ee 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
@@ -251,7 +251,7 @@ public class DownstreamBridge extends PacketHandler
@@ -258,7 +258,7 @@ public class DownstreamBridge extends PacketHandler
brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );

8
BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch
View File

@ -1,14 +1,14 @@
From 48463923389da7dd2e299e068aae1418655671c4 Mon Sep 17 00:00:00 2001
From 7cb2d818052536c475e08d305a5f2696835754f4 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
diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
index 27b5bbea..b60843b5 100644
index bb38f1b1..e918ac1b 100644
--- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
+++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
@@ -202,6 +202,26 @@ public class ComponentsTest
@@ -214,6 +214,26 @@ public class ComponentsTest
Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
}
@ -53,5 +53,5 @@ index 2391c22f..8397db2d 100644
+ }
}
--
2.19.1
2.20.1

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

@ -1,4 +1,4 @@
From 441f1f77ca0f9efb08ded45ebbd15fa0d51cc33d Mon Sep 17 00:00:00 2001
From 5e44afa155b708568fbd414bd5d7f930626b2bb3 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations
@ -8,7 +8,7 @@ Subject: [PATCH] Micro-optimizations
- Don't create a data input stream for every plugin message we get from servers
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 49c97cd9..19b897c0 100644
index d9f49e34..eb369ebb 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -515,7 +515,9 @@ public class BungeeCord extends ProxyServer
@ -23,10 +23,10 @@ index 49c97cd9..19b897c0 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 1693f42b..b54e7b9b 100644
index 277422ee..bfbc8b18 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
@@ -233,7 +233,6 @@ public class DownstreamBridge extends PacketHandler
@@ -240,7 +240,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -34,7 +34,7 @@ index 1693f42b..b54e7b9b 100644
PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -260,6 +259,7 @@ public class DownstreamBridge extends PacketHandler
@@ -267,6 +266,7 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{

6
BungeeCord-Patches/0020-Optional-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 0d6d91e54aa7e1112a193107d52c1cf4de6e6214 Mon Sep 17 00:00:00 2001
From ea1d42deba74d83ef894f4accf66b8ffb61fcb32 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 f7bace0e..e7869cfb 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 b54e7b9b..54be8954 100644
index bfbc8b18..f52c1312 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
@@ -567,6 +567,6 @@ public class DownstreamBridge extends PacketHandler
@@ -602,6 +602,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{

14
BungeeCord-Patches/0028-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From b596e53d71ed3330aba53fb1aa5db81acebd9077 Mon Sep 17 00:00:00 2001
From 04cd75a5a2fe2d1653b5c9bd2f4e5ef6d14d9fc1 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,18 +75,18 @@ index e7869cfb..c7f081d4 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 54be8954..d0c2ac42 100644
index f52c1312..14ab7f58 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
@@ -9,6 +9,7 @@ import com.mojang.brigadier.builder.RequiredArgumentBuilder;
import com.mojang.brigadier.suggestion.SuggestionProvider;
@@ -14,6 +14,7 @@ import com.mojang.brigadier.suggestion.SuggestionProvider;
import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.tree.LiteralCommandNode;
import java.io.DataInput;
+import java.util.Objects; // Waterfall
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.Unpooled;
@@ -70,16 +71,19 @@ public class DownstreamBridge extends PacketHandler
@@ -77,16 +78,19 @@ public class DownstreamBridge extends PacketHandler
return;
}
@ -111,7 +111,7 @@ index 54be8954..d0c2ac42 100644
}
@Override
@@ -94,7 +98,19 @@ public class DownstreamBridge extends PacketHandler
@@ -101,7 +105,19 @@ public class DownstreamBridge extends PacketHandler
if ( !server.isObsolete() )
{
@ -132,7 +132,7 @@ index 54be8954..d0c2ac42 100644
}
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -476,7 +492,11 @@ public class DownstreamBridge extends PacketHandler
@@ -483,7 +499,11 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );

12
BungeeCord-Patches/0031-Proxy-query-event.patch
View File

@ -1,4 +1,4 @@
From 887434ef58f84e7de93fe0791d98228e442c92ab Mon Sep 17 00:00:00 2001
From d2521c4481ccd232d38a9184871cc7adba563ee5 Mon Sep 17 00:00:00 2001
From: minecrafter <unknown@unknown>
Date: Sun, 3 Jul 2016 04:03:21 -0400
Subject: [PATCH] Proxy query event
@ -107,7 +107,7 @@ index 00000000..220d59f0
+ private QueryResult result;
+}
diff --git a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
index 79d6886a..a72cfd92 100644
index 9b81197f..ac99d02c 100644
--- a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
+++ b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
@@ -2,6 +2,8 @@ package net.md_5.bungee.query;
@ -132,7 +132,7 @@ index 79d6886a..a72cfd92 100644
import lombok.Data;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.api.ProxyServer;
@@ -84,19 +88,30 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
@@ -95,19 +99,30 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
throw new IllegalStateException( "No session!" );
}
@ -170,7 +170,7 @@ index 79d6886a..a72cfd92 100644
} else if ( in.readableBytes() == 4 )
{
// Long Response
@@ -106,18 +121,20 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
@@ -117,18 +132,20 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
} );
Map<String, String> data = new LinkedHashMap<>();
@ -201,7 +201,7 @@ index 79d6886a..a72cfd92 100644
for ( Map.Entry<String, String> entry : data.entrySet() )
{
@@ -129,10 +146,7 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
@@ -140,10 +157,7 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
// Padding
writeString( out, "\01player_\00" );
// Player List
@ -214,5 +214,5 @@ index 79d6886a..a72cfd92 100644
} else
{
--
2.19.1
2.20.1

8
BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From f9e766ad2bd4304d50defaa47d567d46e6cd35d7 Mon Sep 17 00:00:00 2001
From 30a0215378f22fc5dfeda5fce5de783801d21763 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
@ -191,10 +191,10 @@ index 6dae9a88..9c872a1c 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 d0c2ac42..56c81262 100644
index 14ab7f58..9737a8d2 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
@@ -42,6 +42,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
@@ -49,6 +49,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.ProtocolConstants;
import net.md_5.bungee.protocol.packet.BossBar;
import net.md_5.bungee.protocol.packet.Commands;
@ -203,7 +203,7 @@ index d0c2ac42..56c81262 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;
@@ -549,6 +551,32 @@ public class DownstreamBridge extends PacketHandler
@@ -584,6 +586,32 @@ public class DownstreamBridge extends PacketHandler
}
}

8
BungeeCord-Patches/0041-Add-console-command-completion.patch
View File

@ -1,4 +1,4 @@
From cabb1c06ae1d9543407e4b1d25d6ff8e71cd054e Mon Sep 17 00:00:00 2001
From bdd6e7c61c4ab74a994c759f7e2929ca8b76ddc5 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 26 Sep 2017 18:59:37 +0200
Subject: [PATCH] Add console command completion
@ -7,10 +7,10 @@ Register command completer for JLine to complete command names and
command arguments (if supported).
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
index afa98ed9..c9ac96d6 100644
index bf894e4a..81bd18f0 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -181,6 +181,41 @@ public class PluginManager
@@ -202,6 +202,41 @@ public class PluginManager
return true;
}
@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
}
--
2.19.1
2.20.1

8
BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From 5e8ac4be1ffc17de941465d30171eb39828b1cbb Mon Sep 17 00:00:00 2001
From 99262e2285605ffe26c6a0e0df756c9ced6c3152 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting
@ -152,10 +152,10 @@ index 9c872a1c..8a524a64 100644
+ // Waterfall end
}
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 9076ce39..da7ade56 100644
index 9737a8d2..8469e665 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
@@ -555,6 +555,7 @@ public class DownstreamBridge extends PacketHandler
@@ -590,6 +590,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityEffect entityEffect) throws Exception
{
@ -163,7 +163,7 @@ index 9076ce39..da7ade56 100644
// Don't send any potions when switching between servers (which involves a handshake), which can trigger a race
// condition on the client.
if (this.con.getForgeClientHandler().isForgeUser() && !this.con.getForgeClientHandler().isHandshakeComplete()) {
@@ -566,6 +567,7 @@ public class DownstreamBridge extends PacketHandler
@@ -601,6 +602,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityRemoveEffect removeEffect) throws Exception
{