Browse Source

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 (Thanks @dualspiral!)

Closes #843

GJ 12 years ago
parent
commit
b2cdf21de5
2 changed files with 6 additions and 1 deletions
  1. 1 0
      Changelog.txt
  2. 5 1
      src/main/java/com/gmail/nossr50/api/PartyAPI.java

+ 1 - 0
Changelog.txt

@@ -12,6 +12,7 @@ Version 1.4.04-dev
  = Fixed bug where Treefeller would try to cut too many leaves and reach the threshold when it shouldn't
  = Fixed bug where Mining wasn't awarding double drops
  = Fixed bug where Shake wouldn't damage mobs whose max health was less than 4
+ = 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 (Thanks @dualspiral!)
 
 Version 1.4.03
  + Added option to advanced.yml to determine the # of enchant levels used when buffing Super Breaker & Giga Drill Breaker

+ 5 - 1
src/main/java/com/gmail/nossr50/api/PartyAPI.java

@@ -19,9 +19,13 @@ 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();
     }