diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java b/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java index f80902bd4..061b03741 100644 --- a/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java +++ b/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java @@ -99,7 +99,7 @@ public class Info extends SubCommand { } private String getPlayerList(ArrayList l) { - if ((l == null) || (l.size() < 1)) { + if (l == null || l.size() < 1) { return " none"; } String c = C.PLOT_USER_LIST.s(); @@ -122,7 +122,7 @@ public class Info extends SubCommand { return "everyone"; } OfflinePlayer plr = Bukkit.getOfflinePlayer(uuid); - if (plr == null) { + if (plr.getName() == null) { return "unknown"; } return plr.getName(); diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/TP.java b/PlotSquared/src/com/intellectualcrafters/plot/commands/TP.java index afbd14cc4..43c95d6aa 100644 --- a/PlotSquared/src/com/intellectualcrafters/plot/commands/TP.java +++ b/PlotSquared/src/com/intellectualcrafters/plot/commands/TP.java @@ -69,7 +69,7 @@ public class TP extends SubCommand { private Plot isAlias(World world, String a) { int index = 0; - if (a.contains(":")) { + if (a.contains(";")) { String[] split = a.split(";"); if (split[1].length()>0 && StringUtils.isNumeric(split[1])) { index = Integer.parseInt(split[1]); diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/list.java b/PlotSquared/src/com/intellectualcrafters/plot/commands/list.java index 1cdca3c77..566a133ed 100644 --- a/PlotSquared/src/com/intellectualcrafters/plot/commands/list.java +++ b/PlotSquared/src/com/intellectualcrafters/plot/commands/list.java @@ -97,7 +97,11 @@ public class list extends SubCommand { if (id == null) { return "none"; } - return Bukkit.getOfflinePlayer(id).getName(); + String name = Bukkit.getOfflinePlayer(id).getName(); + if (name == null) { + return "none"; + } + return name; } private String getArgumentList(String[] strings) { diff --git a/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java index c3b5966d1..f17c4d5ba 100644 --- a/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java +++ b/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java @@ -83,9 +83,9 @@ import com.intellectualcrafters.plot.events.PlayerLeavePlotEvent; public class PlayerEvents implements Listener { private String getName(UUID uuid) { - OfflinePlayer player = Bukkit.getOfflinePlayer(uuid); + String player = Bukkit.getOfflinePlayer(uuid).getName(); if (player != null) { - return player.getName(); + return player; } return "unknown"; }