Fix NPE in toString method

AzisabaNetwork · Apr 18, 2022 · 5c00abf · 5c00abf
1 parent 517f1eb
commit 5c00abf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "net.azisaba.azipluginmessaging"
-version = "2.1.2"
+version = "2.1.3"
 
 repositories {
     mavenCentral()

diff --git a/spigot/src/main/java/net/azisaba/azipluginmessaging/spigot/entity/PlayerImpl.java b/spigot/src/main/java/net/azisaba/azipluginmessaging/spigot/entity/PlayerImpl.java
@@ -116,8 +116,8 @@ public boolean isChallengeEquals(@NotNull String challenge) {
     public String toString() {
         return "PlayerImpl{" +
                 "handle=" + handle +
-                ", publicKey=" + EncryptionUtil.encodePublicKey(keyPair.getPublic()) +
-                ", remotePublicKey=" + EncryptionUtil.encodePublicKey(remotePublicKey) +
+                ", publicKey=" + (keyPair == null ? null : EncryptionUtil.encodePublicKey(keyPair.getPublic())) +
+                ", remotePublicKey=" + (remotePublicKey == null ? null : EncryptionUtil.encodePublicKey(remotePublicKey)) +
                 ", encrypted=" + encrypted +
                 '}';
     }

diff --git a/...ty/src/main/java/net/azisaba/azipluginmessaging/velocity/server/ServerConnectionImpl.java b/...ty/src/main/java/net/azisaba/azipluginmessaging/velocity/server/ServerConnectionImpl.java
@@ -112,8 +112,8 @@ public String toString() {
         return "ServerConnectionImpl{" +
                 "handle=" + handle +
                 ", encrypted=" + encrypted +
-                ", publicKey=" + EncryptionUtil.encodePublicKey(keyPair.getPublic()) +
-                ", remotePublicKey=" + EncryptionUtil.encodePublicKey(publicKey) +
+                ", publicKey=" + (keyPair == null ? null : EncryptionUtil.encodePublicKey(keyPair.getPublic())) +
+                ", remotePublicKey=" + (publicKey == null ? null : EncryptionUtil.encodePublicKey(publicKey)) +
                 '}';
     }
 }