2021-07-04 03:54:12 +02:00
|
|
|
From 81b84d57826eaa631e1f58fc6dc4b52f440582ff Mon Sep 17 00:00:00 2001
|
2016-05-28 18:34:39 +02:00
|
|
|
From: Janmm14 <computerjanimaus@yahoo.de>
|
|
|
|
Date: Sat, 12 Dec 2015 23:43:30 +0100
|
2019-03-30 19:01:17 +01:00
|
|
|
Subject: [PATCH] Improve server list ping logging
|
2016-05-28 18:34:39 +02:00
|
|
|
|
2019-03-30 19:01:17 +01:00
|
|
|
This functionality of this patch was adopted upstream, however, this
|
|
|
|
patch remains for a few misc improvements around here
|
2016-05-28 18:34:39 +02:00
|
|
|
|
2016-11-26 21:39:19 +01:00
|
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
2021-05-26 22:18:14 +02:00
|
|
|
index a8516462..4c45c102 100644
|
2016-11-26 21:39:19 +01:00
|
|
|
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
|
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
2021-05-26 22:18:14 +02:00
|
|
|
@@ -451,6 +451,6 @@ public class ServerConnector extends PacketHandler
|
2016-11-26 21:39:19 +01:00
|
|
|
@Override
|
|
|
|
public String toString()
|
|
|
|
{
|
|
|
|
- return "[" + user.getName() + "] <-> ServerConnector [" + target.getName() + "]";
|
|
|
|
+ return "[" + user.getName() + "|" + user.getAddress() + "] <-> ServerConnector [" + target.getName() + "]";
|
|
|
|
}
|
|
|
|
}
|
2016-05-28 18:34:39 +02:00
|
|
|
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
|
2020-08-29 13:11:57 +02:00
|
|
|
index a859195e..b9783a4c 100644
|
2016-05-28 18:34:39 +02:00
|
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
|
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
2020-08-29 13:11:57 +02:00
|
|
|
@@ -654,6 +654,6 @@ public class DownstreamBridge extends PacketHandler
|
2016-05-28 18:34:39 +02:00
|
|
|
@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
|
2021-07-04 03:54:12 +02:00
|
|
|
index 3eeaeffb..8ee21e14 100644
|
2016-05-28 18:34:39 +02:00
|
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
2021-07-04 03:54:12 +02:00
|
|
|
@@ -647,20 +647,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
2016-05-28 18:34:39 +02:00
|
|
|
@Override
|
|
|
|
public String toString()
|
|
|
|
{
|
2020-02-01 16:39:53 +01:00
|
|
|
- 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();
|
2020-01-21 18:36:22 +01:00
|
|
|
+ return "[" + getSocketAddress() + ( getName() != null ? "|" + getName() : "" ) + "] <-> InitialHandler";
|
2016-05-28 18:34:39 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@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
|
2021-07-03 01:00:48 +02:00
|
|
|
index f88831f7..a667623b 100644
|
2016-05-28 18:34:39 +02:00
|
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
|
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
2021-07-03 01:00:48 +02:00
|
|
|
@@ -284,6 +284,6 @@ public class UpstreamBridge extends PacketHandler
|
2016-05-28 18:34:39 +02:00
|
|
|
@Override
|
|
|
|
public String toString()
|
|
|
|
{
|
|
|
|
- return "[" + con.getName() + "] -> UpstreamBridge";
|
|
|
|
+ return "[" + con.getAddress() + "|" + con.getName() + "] -> UpstreamBridge";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
--
|
2021-07-04 03:54:12 +02:00
|
|
|
2.32.0
|
2016-05-28 18:34:39 +02:00
|
|
|
|