using fix from master

This commit is contained in:
GiovanH 2018-05-11 20:11:32 +01:00
commit 31e80149c2

View File

@ -298,7 +298,11 @@ public final class CommandUtils {
String playerName = offlinePlayer.getName(); String playerName = offlinePlayer.getName();
if (playerName == null) { //Do null checking here to detect corrupted data before sending it throuogh .equals if (playerName == null) { //Do null checking here to detect corrupted data before sending it throuogh .equals
<<<<<<< HEAD
System.err.println("[McMMO] Player data file with UIID " + offlinePlayer.getUniqueId() + " is missing a player name. This may be a legacy file from before bukkit.lastKnownName. This should be okay to ignore."); System.err.println("[McMMO] Player data file with UIID " + offlinePlayer.getUniqueId() + " is missing a player name. This may be a legacy file from before bukkit.lastKnownName. This should be okay to ignore.");
=======
System.err.println("[McMMO] Bad player data file with UIID " + offlinePlayer.getUniqueId() );
>>>>>>> 848080b413785a6f4d31e7760e1238bb7536b24b
continue; //Don't let an error here interrupt the loop continue; //Don't let an error here interrupt the loop
} }