prevent some npe s caused by uuid conversion

DieReicheErethons · Aug 17, 2014 · ec5491e · ec5491e
1 parent 9137c93
commit ec5491e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/com/dre/managerxl/MPlayer.java b/src/com/dre/managerxl/MPlayer.java
@@ -65,8 +65,10 @@ public static Set<MPlayer> get() {
 
 	public static MPlayer get(UUID uuid) {
 		for (MPlayer mPlayer : mPlayers) {
-			if (mPlayer.getUUID().equals(uuid)) {
-				return mPlayer;
+			if (mPlayer != null){
+				if (mPlayer.getUUID().equals(uuid)) {
+					return mPlayer;
+				}
 			}
 		}
 
@@ -75,8 +77,10 @@ public static MPlayer get(UUID uuid) {
 
 	public static MPlayer getOrCreate(UUID uuid) {
 		for (MPlayer mPlayer : mPlayers) {
-			if (mPlayer.getUUID().equals(uuid)) {
-				return mPlayer;
+			if (mPlayer != null){
+				if (mPlayer.getUUID().equals(uuid)) {
+					return mPlayer;
+				}
 			}
 		}