ChromaGaming/ChromaCore
1
0
Fork 0
Code Issues 23 Pull requests 1 Projects Releases 11 Packages Wiki Activity

Fixed NPE on player data access

Browse source
This commit is contained in:
Norbi Peti 2016-10-30 00:23:16 +02:00
parent daa7d29224
commit 0b12aebfe2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/buttondevteam/lib/TBMCPlayer.java
View file

@ -251,6 +251,7 @@ public class TBMCPlayer implements AutoCloseable {
TBMCPlayer player = new TBMCPlayer(); TBMCPlayer player = new TBMCPlayer();
player.uuid = p.getUniqueId(); player.uuid = p.getUniqueId();
player.data.putAll(yc.getValues(true)); player.data.putAll(yc.getValues(true));
LoadedPlayers.put(p.getUniqueId(), player); // Accessing any value requires it to be in the map
Bukkit.getLogger().info("Loaded player: " + player.getPlayerName()); Bukkit.getLogger().info("Loaded player: " + player.getPlayerName());
if (player.getPlayerName() == null) { if (player.getPlayerName() == null) {
player.setPlayerName(p.getName()); player.setPlayerName(p.getName());
@ -268,7 +269,6 @@ public class TBMCPlayer implements AutoCloseable {
player.setPlayerName(p.getName()); player.setPlayerName(p.getName());
Bukkit.getLogger().info("Renaming done."); Bukkit.getLogger().info("Renaming done.");
} }
LoadedPlayers.put(p.getUniqueId(), player);
// Load in other plugins // Load in other plugins
Bukkit.getServer().getPluginManager().callEvent(new TBMCPlayerLoadEvent(yc, player)); Bukkit.getServer().getPluginManager().callEvent(new TBMCPlayerLoadEvent(yc, player));
@ -282,8 +282,8 @@ public class TBMCPlayer implements AutoCloseable {
public static TBMCPlayer addPlayer(OfflinePlayer p) { public static TBMCPlayer addPlayer(OfflinePlayer p) {
TBMCPlayer player = new TBMCPlayer(); TBMCPlayer player = new TBMCPlayer();
player.uuid = p.getUniqueId(); player.uuid = p.getUniqueId();
LoadedPlayers.put(p.getUniqueId(), player); // Accessing any value requires it to be in the map
player.setPlayerName(p.getName()); player.setPlayerName(p.getName());
LoadedPlayers.put(p.getUniqueId(), player);
Bukkit.getServer().getPluginManager().callEvent(new TBMCPlayerAddEvent(player)); Bukkit.getServer().getPluginManager().callEvent(new TBMCPlayerAddEvent(player));
savePlayer(player); savePlayer(player);
return player; return player;