mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-16 07:15:14 +01:00
e10d558b8b
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: f1c32f84 #2379: Add ServerSwitchEvent getFrom API cb3f87bb Update Netty to 4.1.48.Final
74 lines
3.2 KiB
Diff
74 lines
3.2 KiB
Diff
From 51ae3b4db60a3e32284f940a05db847890e16e65 Mon Sep 17 00:00:00 2001
|
|
From: Janmm14 <computerjanimaus@yahoo.de>
|
|
Date: Sat, 12 Dec 2015 23:43:30 +0100
|
|
Subject: [PATCH] Improve server list ping logging
|
|
|
|
This functionality of this patch was adopted upstream, however, this
|
|
patch remains for a few misc improvements around here
|
|
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
|
index 4bf82153..d431f514 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
|
@@ -423,6 +423,6 @@ public class ServerConnector extends PacketHandler
|
|
@Override
|
|
public String toString()
|
|
{
|
|
- return "[" + user.getName() + "] <-> ServerConnector [" + target.getName() + "]";
|
|
+ return "[" + user.getName() + "|" + user.getAddress() + "] <-> ServerConnector [" + target.getName() + "]";
|
|
}
|
|
}
|
|
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 ea905b07..6598781b 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
|
|
@@ -610,6 +610,6 @@ public class DownstreamBridge extends PacketHandler
|
|
@Override
|
|
public String toString()
|
|
{
|
|
- return "[" + con.getName() + "] <-> DownstreamBridge <-> [" + server.getInfo().getName() + "]";
|
|
+ return "[" + con.getAddress() + "|" + con.getName() + "] <-> DownstreamBridge <-> [" + server.getInfo().getName() + "]";
|
|
}
|
|
}
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
index 9b9641d2..1109a9b5 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
@@ -653,20 +653,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
@Override
|
|
public String toString()
|
|
{
|
|
- StringBuilder sb = new StringBuilder();
|
|
- sb.append( '[' );
|
|
-
|
|
- String currentName = getName();
|
|
- if ( currentName != null )
|
|
- {
|
|
- sb.append( currentName );
|
|
- sb.append( ',' );
|
|
- }
|
|
-
|
|
- sb.append( getSocketAddress() );
|
|
- sb.append( "] <-> InitialHandler" );
|
|
-
|
|
- return sb.toString();
|
|
+ return "[" + getSocketAddress() + ( getName() != null ? "|" + getName() : "" ) + "] <-> InitialHandler";
|
|
}
|
|
|
|
@Override
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
|
index c7e1a621..d44d4c2e 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
|
@@ -270,6 +270,6 @@ public class UpstreamBridge extends PacketHandler
|
|
@Override
|
|
public String toString()
|
|
{
|
|
- return "[" + con.getName() + "] -> UpstreamBridge";
|
|
+ return "[" + con.getAddress() + "|" + con.getName() + "] -> UpstreamBridge";
|
|
}
|
|
}
|
|
--
|
|
2.26.0
|
|
|