2023-11-07 12:47:27 +01:00
|
|
|
From 1932cedf8e7963d4f1107147f37d4376fa716995 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
|
2023-11-07 12:47:27 +01:00
|
|
|
index 6db704bd..53eac723 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
|
2023-11-07 12:47:27 +01:00
|
|
|
@@ -507,6 +507,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
|
2023-11-07 12:47:27 +01:00
|
|
|
index 6f74ed82..6f447b6d 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
|
2023-10-29 17:02:58 +01:00
|
|
|
@@ -777,6 +777,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
|
2023-11-04 02:12:26 +01:00
|
|
|
index b51263a2..ea3a9248 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
|
2023-11-04 02:12:26 +01:00
|
|
|
@@ -727,20 +727,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
|
2023-11-04 02:12:26 +01:00
|
|
|
index 84be12e5..6acbf7bf 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
|
2023-11-04 02:12:26 +01:00
|
|
|
@@ -382,6 +382,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";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
--
|
2023-11-04 02:12:26 +01:00
|
|
|
2.42.1
|
2016-05-28 18:34:39 +02:00
|
|
|
|