Fixed skin values and NPE on ping.

MCMDEV · Apr 12, 2022 · 8820901 · 8820901
1 parent 850c528
commit 8820901
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...iles-common/src/main/java/de/mcmdev/hostprofiles/common/connection/ConnectionHandler.java b/...iles-common/src/main/java/de/mcmdev/hostprofiles/common/connection/ConnectionHandler.java
@@ -23,9 +23,9 @@ public boolean handleLogin(ConnectionEvent connectionEvent) {
 		connectionEvent.setUuid(profile.getUuid());
 		connectionEvent.setName(profile.getName());
 		connectionEvent.setSkinCopy(profile.isSkinCopy());
-		if (connectionEvent.getSkinValue() != null) {
+		if (profile.getSkinValue() != null) {
 			connectionEvent.setSkinValue(profile.getSkinValue());
-			if (connectionEvent.getSkinSignature() != null) {
+			if (profile.getSkinSignature() != null) {
 				connectionEvent.setSkinSignature(profile.getSkinSignature());
 			}
 		}

diff --git a/hostprofiles-paper/src/main/java/de/mcmdev/hostprofiles/paper/listener/PaperListener.java b/hostprofiles-paper/src/main/java/de/mcmdev/hostprofiles/paper/listener/PaperListener.java
@@ -14,6 +14,8 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 
+import java.net.InetSocketAddress;
+
 @RequiredArgsConstructor
 public class PaperListener implements Listener {
 
@@ -54,7 +56,9 @@ private void onAsyncLogin(AsyncPlayerPreLoginEvent event) {
 
 	@EventHandler
 	public void onPing(PaperServerListPingEvent event) {
-		String hostname = event.getClient().getVirtualHost().getHostName();
+		InetSocketAddress virtualHost = event.getClient().getVirtualHost();
+		if (virtualHost == null) return;
+		String hostname = virtualHost.getHostName();
 		PingEvent pingEvent = new PingEvent(hostname);
 		connectionHandler.handlePing(pingEvent);
 		if (pingEvent.getMotd() != null) {