From f6e01ea910b006e1ece8ec601ae8ecb734288f93 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 13 Apr 2019 12:58:32 -0700
Subject: [PATCH] UserManager::getPlayer returns null again (oopsie)

---
 Changelog.txt                                               | 6 ++++++
 pom.xml                                                     | 2 +-
 .../java/com/gmail/nossr50/util/player/UserManager.java     | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 3daef5543..5608b6582 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,6 +7,12 @@ Key:
   ! Change
   - Removal
 
+Version 2.1.42
+    Fixed McMMOPlayerNotFoundException being thrown instead of null
+    (API) UserManager.getPlayer() returns null again (oopsie)
+
+    NOTE: Sorry about that, when trying to improve Bungee Cord compatibility I made a big oopsie!
+
 Version 2.1.41
     Fixed NullPointerException errors when trying to grab PlayerProfiles for players who have not loaded
     Added new locale string Profile.PendingLoad
diff --git a/pom.xml b/pom.xml
index 7e4a1dc0d..fec088a57 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.41</version>
+    <version>2.1.42-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/util/player/UserManager.java b/src/main/java/com/gmail/nossr50/util/player/UserManager.java
index 85506be2f..2e220790e 100644
--- a/src/main/java/com/gmail/nossr50/util/player/UserManager.java
+++ b/src/main/java/com/gmail/nossr50/util/player/UserManager.java
@@ -101,12 +101,12 @@ public final class UserManager {
      * @param player target player
      * @return McMMOPlayer object for this player, null if Player has not been loaded
      */
-    public static McMMOPlayer getPlayer(Player player) throws McMMOPlayerNotFoundException {
+    public static McMMOPlayer getPlayer(Player player) {
         //Avoid Array Index out of bounds
         if(player.hasMetadata(mcMMO.playerDataKey))
             return (McMMOPlayer) player.getMetadata(mcMMO.playerDataKey).get(0).value();
         else
-            throw new McMMOPlayerNotFoundException(player);
+            return null;
     }
 
     private static McMMOPlayer retrieveMcMMOPlayer(String playerName, boolean offlineValid) {