Skip to content

Commit 8074f27

Browse files
committed
Remove seemingly no longer needed hunk
1 parent 89e0560 commit 8074f27

File tree

2 files changed

+4
-43
lines changed

2 files changed

+4
-43
lines changed
Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e364a51b4fc1dbad7112b6c1abe43264384b9933 Mon Sep 17 00:00:00 2001
1+
From ea37eb9b6eecb5fdb574cbbb591994bac60fd7ef 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
@@ -44,45 +44,6 @@ index 1a7d8512..ad1704dd 100644
4444
/**
4545
* Allow this packet to be sent as an "extended" packet.
4646
*/
47-
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 96b86e5e..b77d21ad 100644
49-
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
50-
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
51-
@@ -291,7 +291,7 @@ public class ServerConnector extends PacketHandler
52-
53-
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
54-
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
55-
- user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", DefinedPacket.toArray( brand ), handshakeHandler != null && handshakeHandler.isServerForge() ) );
56-
+ user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", brand, handshakeHandler != null && handshakeHandler.isServerForge() ) ); // Waterfall
57-
brand.release();
58-
}
59-
60-
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 c71a7de4..e66b39ea 100644
62-
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
63-
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
64-
@@ -340,7 +340,7 @@ public class DownstreamBridge extends PacketHandler
65-
66-
brand = ByteBufAllocator.DEFAULT.heapBuffer();
67-
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
68-
- pluginMessage.setData( DefinedPacket.toArray( brand ) );
69-
+ pluginMessage.setData( brand );
70-
brand.release();
71-
// changes in the packet are ignored so we need to send it manually
72-
con.unsafe().sendPacket( pluginMessage );
73-
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
74-
index 0a916c04..cfbab43a 100644
75-
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
76-
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
77-
@@ -56,7 +56,7 @@ import net.md_5.bungee.util.PacketLimiter;
78-
public class PipelineUtils
79-
{
80-
81-
- public static final AttributeKey<ListenerInfo> LISTENER = AttributeKey.valueOf( "ListerInfo" );
82-
+ public static final AttributeKey<ListenerInfo> LISTENER = AttributeKey.newInstance( "ListerInfo" );
83-
84-
private static void setChannelInitializerHolders()
85-
{
8647
--
8748
2.53.0
8849

BungeeCord-Patches/0051-Remove-version-from-brand-info.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From d4d30b04145a92324b26dca4f5530ba2ec28edd3 Mon Sep 17 00:00:00 2001
1+
From 594a6c5fcda68f0f79b1fe31beef6b5ddd218929 Mon Sep 17 00:00:00 2001
22
From: Shane Freeder <theboyetronic@gmail.com>
33
Date: Sat, 20 Jun 2020 18:21:17 +0100
44
Subject: [PATCH] Remove version from brand info
55

66

77
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
8-
index 17ecf602..af21ea85 100644
8+
index c809fc1e..d993a677 100644
99
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
1010
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
1111
@@ -344,7 +344,7 @@ public class DownstreamBridge extends PacketHandler
@@ -14,7 +14,7 @@ index 17ecf602..af21ea85 100644
1414
brand = ByteBufAllocator.DEFAULT.heapBuffer();
1515
- DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
1616
+ DefinedPacket.writeString( bungee.getName() + " <- " + serverBrand, brand ); // Waterfall
17-
pluginMessage.setData( brand );
17+
pluginMessage.setData( DefinedPacket.toArray( brand ) );
1818
brand.release();
1919
// changes in the packet are ignored so we need to send it manually
2020
--

0 commit comments

Comments
 (0)