From 1962ff0eec50eebb7c9a926663483aa192ec5c52 Mon Sep 17 00:00:00 2001
From: LOOHP <jamesloohp@gmail.com>
Date: Sat, 10 Apr 2021 21:21:54 +0800
Subject: [PATCH] Use bungeecord provided ip (if bungeecord is true) for
 connection messages

---
 pom.xml                                                   | 2 +-
 .../java/com/loohp/limbo/server/ClientConnection.java     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index a4dc0e3..51abbec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>com.loohp.limbo</groupId>
 	<artifactId>Limbo</artifactId>
 	<name>Limbo</name>
-	<version>0.4.3-ALPHA</version>
+	<version>0.4.4-ALPHA</version>
 	
 	<description>Standalone Limbo Minecraft Server.</description>
 	<url>https://github.com/LOOHP/Limbo</url>
diff --git a/src/main/java/com/loohp/limbo/server/ClientConnection.java b/src/main/java/com/loohp/limbo/server/ClientConnection.java
index fb6243c..b74598b 100644
--- a/src/main/java/com/loohp/limbo/server/ClientConnection.java
+++ b/src/main/java/com/loohp/limbo/server/ClientConnection.java
@@ -182,7 +182,7 @@ public class ClientConnection extends Thread {
 		    if (handShakeSize == 0xFE) {
 		    	state = ClientState.LEGACY;			    
 		    	output.writeByte(255);
-		    	String str = client_socket.getInetAddress().getHostName() + ":" + client_socket.getPort();
+		    	String str = inetAddress.getHostName() + ":" + client_socket.getPort();
 		    	Limbo.getInstance().getConsole().sendMessage("[/" + str + "] <-> Legacy Status has pinged");
 		    	ServerProperties p = Limbo.getInstance().getServerProperties();
 		    	StatusPingEvent event = Limbo.getInstance().getEventsManager().callEvent(new StatusPingEvent(this, p.getVersionString(), p.getProtocol(), ComponentSerializer.parse(p.getMotdJson()), p.getMaxPlayers(), Limbo.getInstance().getPlayers().size(), p.getFavicon().orElse(null)));
@@ -216,7 +216,7 @@ public class ClientConnection extends Thread {
 						if (packetType == null) {
 							//do nothing
 						} else if (packetType.equals(PacketStatusInRequest.class)) {
-							String str = client_socket.getInetAddress().getHostName() + ":" + client_socket.getPort();
+							String str = inetAddress.getHostName() + ":" + client_socket.getPort();
 							if (Limbo.getInstance().getServerProperties().handshakeVerboseEnabled()) {
 								Limbo.getInstance().getConsole().sendMessage("[/" + str + "] <-> Handshake Status has pinged");
 							}
@@ -328,7 +328,7 @@ public class ClientConnection extends Thread {
 				PacketPlayOutPlayerAbilities abilities = new PacketPlayOutPlayerAbilities(0.05F, 0.1F, flags.toArray(new PlayerAbilityFlags[flags.size()]));
 				sendPacket(abilities);
 
-				String str = client_socket.getInetAddress().getHostName() + ":" + client_socket.getPort() + "|" + player.getName();
+				String str = inetAddress.getHostName() + ":" + client_socket.getPort() + "|" + player.getName();
 				Limbo.getInstance().getConsole().sendMessage("[/" + str + "] <-> Player had connected to the Limbo server!");
 
 				PacketPlayOutDeclareCommands declare = DeclareCommands.getDeclareCommandsPacket(player);
@@ -446,7 +446,7 @@ public class ClientConnection extends Thread {
 
 				Limbo.getInstance().getEventsManager().callEvent(new PlayerQuitEvent(player));
 
-		    	str = client_socket.getInetAddress().getHostName() + ":" + client_socket.getPort() + "|" + player.getName();
+		    	str = inetAddress.getHostName() + ":" + client_socket.getPort() + "|" + player.getName();
 		    	Limbo.getInstance().getConsole().sendMessage("[/" + str + "] <-> Player had disconnected!");
 
 	    	}