From 811ba7d6fcebbd02e19a277d9f353847772a2265 Mon Sep 17 00:00:00 2001 From: Daniel Naylor Date: Sat, 16 Mar 2013 20:55:50 +0000 Subject: [PATCH] Fix to NPE in the Party API getPartyName method when the target isn't in a party. It now returns "null" if the player isn't in a party. --- Changelog.txt | 3 ++- src/main/java/com/gmail/nossr50/api/PartyAPI.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index f4671a197..cc2ea4c93 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -9,7 +9,8 @@ Key: Version 1.4.04-dev = Fixed bug where trying to activate a Chimaera Wing would require one item too much - = Fixed bug where Treefeller would try to cut too many leaves and reach the threshold when it shouldn't + = Fixed bug where Treefeller would try to cut too many leaves and reach the threshold when it shouldn't + = Fixed bug where the API would fail if the name of a player's current party is requested when the player isn't in one. Version 1.4.03 + Added option to advanced.yml to determine the # of enchant levels used when buffing Super Breaker & Giga Drill Breaker diff --git a/src/main/java/com/gmail/nossr50/api/PartyAPI.java b/src/main/java/com/gmail/nossr50/api/PartyAPI.java index e0c83c36e..61d87ce15 100644 --- a/src/main/java/com/gmail/nossr50/api/PartyAPI.java +++ b/src/main/java/com/gmail/nossr50/api/PartyAPI.java @@ -19,9 +19,12 @@ public final class PartyAPI { * This function is designed for API usage. * * @param player The player to check the party name of - * @return the name of the player's party + * @return the name of the player's party, or null if not in a party */ public static String getPartyName(Player player) { + if (!inParty(player)) { + return null; + } return UserManager.getPlayer(player).getParty().getName(); }