Fix NPE on player join but terminating connection

SilverstoneMC · Apr 13, 2024 · 7ae6ece · 7ae6ece
1 parent 8b9c3ff
commit 7ae6ece
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/SilverstoneProxy/pom.xml b/SilverstoneProxy/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.silverstonemc</groupId>
     <artifactId>SilverstoneProxy</artifactId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>

diff --git a/SilverstoneProxy/src/main/java/net/silverstonemc/silverstoneproxy/utils/NicknameUtils.java b/SilverstoneProxy/src/main/java/net/silverstonemc/silverstoneproxy/utils/NicknameUtils.java
@@ -58,6 +58,8 @@ public boolean setNickname(@Nullable Player player, CommandSource sender, @Nulla
     // Set the player's display name without saving anything
     @SuppressWarnings("DataFlowIssue")
     public void changeDisplayName(Player player, Component nickname) {
+        if (player == null) return;
+
         TabPlayer tabPlayer = TabAPI.getInstance().getPlayer(player.getUniqueId());
         if (nickname == null) {
             TabAPI.getInstance().getTabListFormatManager().setName(tabPlayer, null);