From 606a92f1efff1b86f2026e2bed377c9ff1f80e9a Mon Sep 17 00:00:00 2001 From: Warrior <50800980+Warriorrrr@users.noreply.github.com> Date: Tue, 4 Apr 2023 02:48:01 +0200 Subject: [PATCH] Fix /party teleport NPE (#4885) --- .../com/gmail/nossr50/commands/party/PartyCommand.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java index f3523445cb..752552747d 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java @@ -200,15 +200,19 @@ public List onTabComplete(@NotNull CommandSender sender, @NotNull Comman if (matches.size() == 0) { Player player = (Player) sender; + final McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Not Loaded - if(UserManager.getPlayer(player) == null) + if(mcMMOPlayer == null) { sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad")); return ImmutableList.of(); } - Party party = UserManager.getPlayer(player).getParty(); + if (mcMMOPlayer.getParty() == null) + return ImmutableList.of(); + + final Party party = mcMMOPlayer.getParty(); playerNames = party.getOnlinePlayerNames(player); return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<>(playerNames.size()));