Skip to content

Commit 403559f

Browse files
linsaftwlinsaftw
committed
1.21.11 support
1 parent f01bb0d commit 403559f

24 files changed

Lines changed: 124 additions & 124 deletions

‎BungeeCord‎

‎BungeeCord-Patches/0001-POM-Changes.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4bf741b711326cad7051ac737d7ba112f99c205d Mon Sep 17 00:00:00 2001
1+
From 954d5aa3e32098156059b7d80b094bc35e3f9610 Mon Sep 17 00:00:00 2001
22
From: Tux <write@imaginarycode.com>
33
Date: Thu, 19 May 2016 19:33:31 +0200
44
Subject: [PATCH] POM Changes
@@ -154,7 +154,7 @@ index 6be22739..a4516ed9 100644
154154
return;
155155
}
156156
diff --git a/chat/pom.xml b/chat/pom.xml
157-
index a149e83c..b5180fb8 100644
157+
index ed80a085..79a94905 100644
158158
--- a/chat/pom.xml
159159
+++ b/chat/pom.xml
160160
@@ -4,19 +4,19 @@
@@ -184,7 +184,7 @@ index a149e83c..b5180fb8 100644
184184
<dependencies>
185185
<dependency>
186186
diff --git a/config/pom.xml b/config/pom.xml
187-
index 24150823..0832a8cb 100644
187+
index 5f0f46a8..b8d4d69a 100644
188188
--- a/config/pom.xml
189189
+++ b/config/pom.xml
190190
@@ -4,19 +4,19 @@
@@ -595,7 +595,7 @@ index d7ff234f..ecfaeb7e 100644
595595
<license>
596596
<name>BSD-3-Clause</name>
597597
diff --git a/pom.xml b/pom.xml
598-
index 6db2b04b..8dbe11bb 100644
598+
index 7c931649..8ccae176 100644
599599
--- a/pom.xml
600600
+++ b/pom.xml
601601
@@ -3,18 +3,18 @@
@@ -667,7 +667,7 @@ index 6db2b04b..8dbe11bb 100644
667667
</issueManagement>
668668
- <ciManagement>
669669
- <system>jenkins</system>
670-
- <url>http://ci.md-5.net/job/BungeeCord</url>
670+
- <url>https://hub.spigotmc.org/jenkins/job/BungeeCord/</url>
671671
- </ciManagement>
672672

673673
<distributionManagement>
@@ -913,7 +913,7 @@ index 98c88cad..c57c6b13 100644
913913
<scope>compile</scope>
914914
</dependency>
915915
diff --git a/serializer/pom.xml b/serializer/pom.xml
916-
index d22931c0..c5cb6c2d 100644
916+
index b082b3e6..2159b626 100644
917917
--- a/serializer/pom.xml
918918
+++ b/serializer/pom.xml
919919
@@ -4,19 +4,19 @@
@@ -989,5 +989,5 @@ index a062a210..2a74a343 100644
989989
<properties>
990990
<checkstyle.skip>true</checkstyle.skip>
991991
--
992-
2.51.0
992+
2.43.0
993993

‎BungeeCord-Patches/0002-Copy-license-files-into-jar.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 9e23f15ddcedd1ddda23827e564ecd3058687010 Mon Sep 17 00:00:00 2001
1+
From ccbbe8b89ef6acc508f7f82a6268907d26989218 Mon Sep 17 00:00:00 2001
22
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
33
Date: Wed, 18 Jul 2018 20:23:03 +0300
44
Subject: [PATCH] Copy license files into jar
55

66

77
diff --git a/proxy/pom.xml b/proxy/pom.xml
8-
index 63bc0b32..a70f8c5c 100644
8+
index f1fadd9d..315f5f91 100644
99
--- a/proxy/pom.xml
1010
+++ b/proxy/pom.xml
11-
@@ -131,4 +131,26 @@
11+
@@ -132,4 +132,26 @@
1212
<scope>runtime</scope>
1313
</dependency>
1414
</dependencies>
@@ -36,5 +36,5 @@ index 63bc0b32..a70f8c5c 100644
3636
+ <!-- Waterfall end -->
3737
</project>
3838
--
39-
2.44.0
39+
2.43.0
4040

‎BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7f4cf9d71a59d41af45ac58137c0f9b7874a9b0f Mon Sep 17 00:00:00 2001
1+
From c515f9ae462ebf2d75ea0bc24f6661b41b9fb6d5 Mon Sep 17 00:00:00 2001
22
From: Tux <write@imaginarycode.com>
33
Date: Thu, 19 May 2016 11:28:45 -0700
44
Subject: [PATCH] Rename references from BungeeCord to Waterfall
@@ -18,10 +18,10 @@ index f1ccd4f6..d703d6d2 100644
1818
}
1919

2020
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
21-
index 3576d6ae..3158dbfa 100644
21+
index 23f22da8..3a1f7174 100644
2222
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
2323
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
24-
@@ -183,7 +183,7 @@ public class BungeeCord extends ProxyServer
24+
@@ -184,7 +184,7 @@ public class BungeeCord extends ProxyServer
2525
public BungeeCord() throws IOException
2626
{
2727
// Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
@@ -30,7 +30,7 @@ index 3576d6ae..3158dbfa 100644
3030

3131
reloadMessages();
3232

33-
@@ -543,7 +543,7 @@ public class BungeeCord extends ProxyServer
33+
@@ -538,7 +538,7 @@ public class BungeeCord extends ProxyServer
3434
@Override
3535
public String getName()
3636
{
@@ -40,14 +40,14 @@ index 3576d6ae..3158dbfa 100644
4040

4141
@Override
4242
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
43-
index cec7fadb..4cc58a5d 100644
43+
index 6fbfc9d4..4cc58a5d 100644
4444
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
4545
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
4646
@@ -56,7 +56,7 @@ public class BungeeCordLauncher
4747
if ( buildDate.before( deadline.getTime() ) )
4848
{
4949
System.err.println( "*** Warning, this build is outdated ***" );
50-
- System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" );
50+
- System.err.println( "*** Please download a new build from https://www.spigotmc.org/go/bungeecord-dl ***" );
5151
+ System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
5252
System.err.println( "*** You will get NO support regarding this build ***" );
5353
System.err.println( "*** Server will start in 10 seconds ***" );
@@ -88,7 +88,7 @@ index efe048c9..720d0c3b 100644
8888
}
8989
}
9090
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
91-
index 25ef7ff5..a08d4772 100644
91+
index 65d782f7..39809d60 100644
9292
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
9393
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
9494
@@ -217,7 +217,7 @@ public class YamlConfig implements ConfigurationAdapter
@@ -101,5 +101,5 @@ index 25ef7ff5..a08d4772 100644
101101
SocketAddress address = Util.getAddr( addr );
102102
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
103103
--
104-
2.49.0
104+
2.43.0
105105

‎BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 39d85d3f521e27dd286fb96b6af66c301bc051dc Mon Sep 17 00:00:00 2001
1+
From 6eef1e5845f2ed149e789e985682fb3fc7859d21 Mon Sep 17 00:00:00 2001
22
From: Techcable <Techcable@techcable.net>
33
Date: Tue, 25 Oct 2016 11:58:37 -0400
44
Subject: [PATCH] Add Waterfall configuration files
@@ -42,7 +42,7 @@ index 00000000..741ebfde
4242
+
4343
+}
4444
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
45-
index 3158dbfa..d4d2866f 100644
45+
index 3a1f7174..8df78ace 100644
4646
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
4747
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
4848
@@ -6,6 +6,7 @@ import com.google.common.collect.Iterables;
@@ -53,7 +53,7 @@ index 3158dbfa..d4d2866f 100644
5353
import io.netty.bootstrap.ServerBootstrap;
5454
import io.netty.channel.Channel;
5555
import io.netty.channel.ChannelException;
56-
@@ -103,7 +104,7 @@ public class BungeeCord extends ProxyServer
56+
@@ -104,7 +105,7 @@ public class BungeeCord extends ProxyServer
5757
* Configuration.
5858
*/
5959
@Getter
@@ -76,7 +76,7 @@ index b16d24e1..4e974d17 100644
7676

7777
/**
7878
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
79-
index a08d4772..3d97d674 100644
79+
index 39809d60..f8df7d10 100644
8080
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
8181
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
8282
@@ -46,10 +46,15 @@ public class YamlConfig implements ConfigurationAdapter
@@ -118,5 +118,5 @@ index a08d4772..3d97d674 100644
118118
if ( permissions == null )
119119
{
120120
--
121-
2.49.0
121+
2.43.0
122122

‎BungeeCord-Patches/0005-Disable-Metrics.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
From 11e76cd77090962082a021e69881c1cbe7194653 Mon Sep 17 00:00:00 2001
1+
From 853a9e9de1dfba27515c129ffd21d6e608559d55 Mon Sep 17 00:00:00 2001
22
From: Jamie Mansfield <dev@jamierocks.uk>
33
Date: Thu, 19 May 2016 10:55:20 -0700
44
Subject: [PATCH] Disable Metrics
55

66
MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;)
77

88
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
9-
index d4d2866f..139426bb 100644
9+
index 8df78ace..52f2044f 100644
1010
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
1111
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
12-
@@ -114,7 +114,7 @@ public class BungeeCord extends ProxyServer
12+
@@ -115,7 +115,7 @@ public class BungeeCord extends ProxyServer
1313
* locations.yml save thread.
1414
*/
1515
private final Timer saveThread = new Timer( "Reconnect Saver" );
@@ -18,7 +18,7 @@ index d4d2866f..139426bb 100644
1818
/**
1919
* Server socket listener.
2020
*/
21-
@@ -319,7 +319,7 @@ public class BungeeCord extends ProxyServer
21+
@@ -320,7 +320,7 @@ public class BungeeCord extends ProxyServer
2222
}
2323
}
2424
}, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@@ -27,7 +27,7 @@ index d4d2866f..139426bb 100644
2727

2828
Runtime.getRuntime().addShutdownHook( new Thread()
2929
{
30-
@@ -475,7 +475,7 @@ public class BungeeCord extends ProxyServer
30+
@@ -476,7 +476,7 @@ public class BungeeCord extends ProxyServer
3131
reconnectHandler.close();
3232
}
3333
saveThread.cancel();
@@ -177,5 +177,5 @@ index eabf7573..00000000
177177
- }
178178
-}
179179
--
180-
2.49.0
180+
2.43.0
181181

‎BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
From e8b830735afa54b82ac3ebbc9a64601a4dbfb360 Mon Sep 17 00:00:00 2001
1+
From a2014acaefd387797c7d470f315ef23837f854f4 Mon Sep 17 00:00:00 2001
22
From: Tux <write@imaginarycode.com>
33
Date: Thu, 19 May 2016 11:34:52 -0700
44
Subject: [PATCH] Fetch modules from the Waterfall API endpoint
55

66
Don't fetch from the BungeeCord CI, as that only has their modules
77

88
diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
9-
index 064639f3..6a6661a5 100644
9+
index 8f5f34ae..6a6661a5 100644
1010
--- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
1111
+++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
1212
@@ -19,11 +19,19 @@ public class JenkinsModuleSource implements ModuleSource
1313
ProxyServer.getInstance().getLogger().info( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
1414
try
1515
{
16-
- URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
16+
- URL website = new URL( "https://hub.spigotmc.org/jenkins/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
1717
+ final String url = String.format(
1818
+ "https://api.papermc.io/v2/projects/%1$s/versions/%2$s/builds/%3$s/downloads/%4$s-%2$s-%3$s.jar",
1919
+ "waterfall",
@@ -31,5 +31,5 @@ index 064639f3..6a6661a5 100644
3131
Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
3232
ProxyServer.getInstance().getLogger().info( "Download complete" );
3333
--
34-
2.47.0
34+
2.43.0
3535

‎BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 10f8e7b785855c7d8263813519adca874d8f4a85 Mon Sep 17 00:00:00 2001
1+
From 7295072e5a4c7de71fcc6d3805b3e9d608b0390b Mon Sep 17 00:00:00 2001
22
From: Troy Frew <fuzzy_bot@arenaga.me>
33
Date: Tue, 15 Nov 2016 09:07:51 -0500
44
Subject: [PATCH] Fixup ProtocolConstants
55

66

77
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
8-
index eae98554..f8be48b9 100644
8+
index 3f4e3c05..5f7faa2c 100644
99
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
1010
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
11-
@@ -131,6 +131,16 @@ public class ProtocolConstants
11+
@@ -135,6 +135,16 @@ public class ProtocolConstants
1212
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
1313
}
1414

@@ -26,5 +26,5 @@ index eae98554..f8be48b9 100644
2626
{
2727

2828
--
29-
2.39.5
29+
2.43.0
3030

‎BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f06187bcb2c621da8ca40e94412ced60bc37290a Mon Sep 17 00:00:00 2001
1+
From ce449aaa29ea3b040eadfe90e218e38a1260cbec Mon Sep 17 00:00:00 2001
22
From: Techcable <Techcable@techcable.net>
33
Date: Tue, 3 May 2016 20:31:52 -0700
44
Subject: [PATCH] Don't access a ByteBuf's underlying array
@@ -45,10 +45,10 @@ index 1a7d8512..ad1704dd 100644
4545
* Allow this packet to be sent as an "extended" packet.
4646
*/
4747
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
48-
index d47f5ef9..ef348679 100644
48+
index ff61dc9b..131dff53 100644
4949
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
5050
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
51-
@@ -287,7 +287,7 @@ public class ServerConnector extends PacketHandler
51+
@@ -291,7 +291,7 @@ public class ServerConnector extends PacketHandler
5252

5353
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
5454
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@@ -58,7 +58,7 @@ index d47f5ef9..ef348679 100644
5858
}
5959

6060
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
61-
index aa5b5bc6..e6993044 100644
61+
index fdb5cd46..11931c78 100644
6262
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
6363
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
6464
@@ -329,7 +329,7 @@ public class DownstreamBridge extends PacketHandler
@@ -84,5 +84,5 @@ index 0a916c04..cfbab43a 100644
8484
private static void setChannelInitializerHolders()
8585
{
8686
--
87-
2.49.0
87+
2.43.0
8888

‎BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ec19d8d8ecfb3b05d62cfdcf51a1316a20327bef Mon Sep 17 00:00:00 2001
1+
From 28d5b8062b839f82fe27935809b996dab591e137 Mon Sep 17 00:00:00 2001
22
From: Techcable <Techcable@techcable.net>
33
Date: Thu, 19 May 2016 17:09:22 -0600
44
Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -43,18 +43,19 @@ index abcb53bb..0dd0fe31 100644
4343
{
4444
packet.read( in, protocol, prot.getDirection(), protocolVersion );
4545
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
46-
index dea027b0..ee354aeb 100644
46+
index 690e1447..1d74d590 100644
4747
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
4848
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
49-
@@ -1036,14 +1036,23 @@ public enum Protocol
49+
@@ -1063,14 +1063,23 @@ public enum Protocol
5050
return protocol;
5151
}
5252

53+
- public final DefinedPacket createPacket(int id, int version)
5354
+ public boolean hasPacket(int i, boolean supportsForge) {
5455
+ return supportsForge || i >= 0 && i <= MAX_PACKET_ID;
5556
+ }
5657
+
57-
public final DefinedPacket createPacket(int id, int version)
58+
+ public final DefinedPacket createPacket(int id, int version)
5859
+ {
5960
+ return createPacket(id, version, true);
6061
+ }
@@ -72,22 +73,21 @@ index dea027b0..ee354aeb 100644
7273
throw new BadPacketException( "Packet with id " + id + " outside of range" );
7374
}
7475
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
75-
index 6ed9e8b3..509f07c3 100644
76+
index 5b1ee946..cc133717 100644
7677
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
7778
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
78-
@@ -246,6 +246,12 @@ public class ServerConnector extends PacketHandler
79-
public static void handleLogin(ProxyServer bungee, ChannelWrapper ch, UserConnection user, BungeeServerInfo target, ForgeServerHandler handshakeHandler, ServerConnection server, Login login) throws Exception
80-
{
79+
@@ -248,6 +248,11 @@ public class ServerConnector extends PacketHandler
8180
ServerConnectedEvent event = new ServerConnectedEvent( user, server );
82-
+
81+
bungee.getPluginManager().callEvent( event );
82+
8383
+ if (server.isForgeServer() && user.isForgeUser()) {
8484
+ ((net.md_5.bungee.protocol.MinecraftDecoder) server.getCh().getHandle().pipeline().get(net.md_5.bungee.netty.PipelineUtils.PACKET_DECODER)).setSupportsForge(true);
8585
+ ((net.md_5.bungee.protocol.MinecraftDecoder) user.getCh().getHandle().pipeline().get(net.md_5.bungee.netty.PipelineUtils.PACKET_DECODER)).setSupportsForge(true);
8686
+ }
8787
+
88-
bungee.getPluginManager().callEvent( event );
89-
90-
ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
88+
// Already sent after config start
89+
if ( user.getPendingConnection().getVersion() < ProtocolConstants.MINECRAFT_1_20_2 )
90+
{
9191
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
9292
index 77b27c6f..26c1e1be 100644
9393
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java

0 commit comments

Comments
 (0)