EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE for new data tracker

Browse Source
This commit is contained in:
nossr50 2019-06-05 21:43:07 -07:00
parent 3ce3ac5350
commit 426b2d27e7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gmail/nossr50/util/player/UserManager.java
View File

@ -16,9 +16,7 @@ public final class UserManager {
private static HashSet<McMMOPlayer> playerDataSet; //Used to track players for sync saves on shutdown private static HashSet<McMMOPlayer> playerDataSet; //Used to track players for sync saves on shutdown
private UserManager() { private UserManager() {}
playerDataSet = new HashSet<>();
}
/** /**
* Track a new user. * Track a new user.
@ -27,6 +25,10 @@ public final class UserManager {
*/ */
public static void track(McMMOPlayer mcMMOPlayer) { public static void track(McMMOPlayer mcMMOPlayer) {
mcMMOPlayer.getPlayer().setMetadata(mcMMO.playerDataKey, new FixedMetadataValue(mcMMO.p, mcMMOPlayer)); mcMMOPlayer.getPlayer().setMetadata(mcMMO.playerDataKey, new FixedMetadataValue(mcMMO.p, mcMMOPlayer));
if(playerDataSet == null)
playerDataSet = new HashSet<>();
playerDataSet.add(mcMMOPlayer); //for sync saves on shutdown playerDataSet.add(mcMMOPlayer); //for sync saves on shutdown
} }
@ -42,7 +44,9 @@ public final class UserManager {
public static void remove(Player player) { public static void remove(Player player) {
McMMOPlayer mcMMOPlayer = getPlayer(player); McMMOPlayer mcMMOPlayer = getPlayer(player);
player.removeMetadata(mcMMO.playerDataKey, mcMMO.p); player.removeMetadata(mcMMO.playerDataKey, mcMMO.p);
playerDataSet.remove(mcMMOPlayer); //Clear sync save tracking
if(playerDataSet != null && playerDataSet.contains(mcMMOPlayer))
playerDataSet.remove(mcMMOPlayer); //Clear sync save tracking
} }
/** /**
@ -53,7 +57,8 @@ public final class UserManager {
remove(player); remove(player);
} }
playerDataSet.clear(); //Clear sync save tracking if(playerDataSet != null)
playerDataSet.clear(); //Clear sync save tracking
} }
/** /**