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

using latest command fix from master, using anvil fix from dev

Browse Source
This commit is contained in:
GiovanH 2018-05-11 20:14:45 +01:00
parent 31e80149c2
commit 3dc92f2e97
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java
View File

@ -298,11 +298,7 @@ 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
} }