mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-07-09 21:04:42 +02:00
6f3e7d0d4d
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 697f0875 #2770: Handle posix signals SIGTERM, SIGINT, SIGHUP gracefully
48 lines
2.5 KiB
Diff
48 lines
2.5 KiB
Diff
From 107b9d76172039b219014ab5c905c175433ed06c 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
|
|
|
|
- PluginManager.dispatchCommand() avoids regex while splitting commands. Java 7 introduced an optimized String.split() that should be used instead (affects command dispatch).
|
|
- Don't attempt to format arguments when there are none provided
|
|
- 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 f89dcbc8..38b96d73 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
@@ -558,7 +558,9 @@ public class BungeeCord extends ProxyServer
|
|
String translation = "<translation '" + name + "' missing>";
|
|
try
|
|
{
|
|
- translation = MessageFormat.format( customBundle != null && customBundle.containsKey( name ) ? customBundle.getString( name ) : baseBundle.getString( name ), args );
|
|
+ final String string = customBundle != null && customBundle.containsKey( name ) ? customBundle.getString( name ) : baseBundle.getString( name );
|
|
+
|
|
+ translation = ( args.length == 0 ) ? string : MessageFormat.format( string, args );
|
|
} catch ( MissingResourceException ex )
|
|
{
|
|
}
|
|
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 a2f62648..ea905b07 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
|
|
@@ -244,7 +244,6 @@ public class DownstreamBridge extends PacketHandler
|
|
@Override
|
|
public void handle(PluginMessage pluginMessage) throws Exception
|
|
{
|
|
- DataInput in = pluginMessage.getStream();
|
|
PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
|
|
|
|
if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
|
|
@@ -271,6 +270,7 @@ public class DownstreamBridge extends PacketHandler
|
|
|
|
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
|
|
{
|
|
+ DataInput in = pluginMessage.getStream();
|
|
ByteArrayDataOutput out = ByteStreams.newDataOutput();
|
|
String subChannel = in.readUTF();
|
|
|
|
--
|
|
2.25.0
|
|
|