mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-06-29 07:54:48 +02:00
Upstream has released updates that appear 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: 0509303f #3519: Queue configuration phase packets from API methods f486a251 #3518: Bump io.netty:netty-bom from 4.1.97.Final to 4.1.98.Final
74 lines
3.2 KiB
Diff
74 lines
3.2 KiB
Diff
From 67b70e860e249dffbcb66046988fc0335bee1ef0 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 56e500a1..0ef085ef 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
|
@@ -500,6 +500,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 23e7b6d8..88b0156c 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
|
|
@@ -774,6 +774,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 107ff484..68687242 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
|
|
@@ -741,20 +741,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 cfad8f53..10df98ff 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
|
|
@@ -362,6 +362,6 @@ public class UpstreamBridge extends PacketHandler
|
|
@Override
|
|
public String toString()
|
|
{
|
|
- return "[" + con.getName() + "] -> UpstreamBridge";
|
|
+ return "[" + con.getAddress() + "|" + con.getName() + "] -> UpstreamBridge";
|
|
}
|
|
}
|
|
--
|
|
2.42.0
|
|
|