From 097e5feab1bd1e615fceba3bbefdd48eb6239d0e Mon Sep 17 00:00:00 2001 From: spacerocket62 Date: Sun, 31 Oct 2021 19:57:35 -0700 Subject: [PATCH 1/2] Fixes NPE of https://gist.github.com/Wild1145/4dfd2c2fd3c38331d79c5672e700ec74 Added check to check if user is null or not Added check to make sure the stripped strings are not null (tfm tag & guild tag) --- .../tfguilds/listener/JoinListener.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java b/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java index a01c041..c1ef69e 100644 --- a/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java +++ b/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java @@ -43,13 +43,19 @@ public void onPlayerJoin(PlayerJoinEvent event) int maxLength = ConfigEntry.GLOBAL_TAG_MAX_LENGTH.getInteger(); String tfmTag = TFGuilds.getPlugin().getTfmBridge().getTag(player); - if (user.displayTag() && tfmTag != null && guild.getTag() != null && maxLength > 0) + if (user != null && user.displayTag() && tfmTag != null && guild.getTag() != null && maxLength > 0) { - int length = GUtil.removeColorCodes(tfmTag).length() + GUtil.removeColorCodes(guild.getTag()).length(); - if (length > maxLength) + String tfmTagStripped = GUtil.removeColorCodes(tfmTag); + String guildTagStripped = GUtil.removeColorCodes(guild.getTag()); + if (tfmTagStripped != null && guildTagStripped != null) { - TFGuilds.getPlugin().getTfmBridge().clearTag(player); + int length = GUtil.removeColorCodes(tfmTag).length() + GUtil.removeColorCodes(guild.getTag()).length(); + if (length > maxLength) + { + TFGuilds.getPlugin().getTfmBridge().clearTag(player); + } } + } } } From c47e42256e4e1d51e52895ae43fe495368e2fd58 Mon Sep 17 00:00:00 2001 From: spacerocket62 Date: Sun, 31 Oct 2021 20:27:36 -0700 Subject: [PATCH 2/2] Forgot to use variables to substitute --- .../java/me/totalfreedom/tfguilds/listener/JoinListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java b/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java index c1ef69e..bae6f31 100644 --- a/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java +++ b/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java @@ -49,7 +49,7 @@ public void onPlayerJoin(PlayerJoinEvent event) String guildTagStripped = GUtil.removeColorCodes(guild.getTag()); if (tfmTagStripped != null && guildTagStripped != null) { - int length = GUtil.removeColorCodes(tfmTag).length() + GUtil.removeColorCodes(guild.getTag()).length(); + int length = tfmTagStripped.length() + guildTagStripped.length(); if (length > maxLength) { TFGuilds.getPlugin().getTfmBridge().clearTag(player);