|
1 | | -From e364a51b4fc1dbad7112b6c1abe43264384b9933 Mon Sep 17 00:00:00 2001 |
| 1 | +From ea37eb9b6eecb5fdb574cbbb591994bac60fd7ef Mon Sep 17 00:00:00 2001 |
2 | 2 | From: Techcable <Techcable@techcable.net> |
3 | 3 | Date: Tue, 3 May 2016 20:31:52 -0700 |
4 | 4 | Subject: [PATCH] Don't access a ByteBuf's underlying array |
@@ -44,45 +44,6 @@ index 1a7d8512..ad1704dd 100644 |
44 | 44 | /** |
45 | 45 | * Allow this packet to be sent as an "extended" packet. |
46 | 46 | */ |
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 | | - { |
86 | 47 | -- |
87 | 48 | 2.53.0 |
88 | 49 |
|
0 commit comments