Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-23 18:55:25 +01:00
Code Issues Projects Releases Wiki Activity

Update commands to search by UUID

Browse Source
This commit is contained in:
gravitylow 2014-04-16 23:15:14 -04:00
parent bad3d779c5
commit 51ac5d2cb2
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/massivecraft/factions/cmd/FCommand.java
View File

@ -131,11 +131,14 @@ public abstract class FCommand extends MCommand<P> {
FPlayer ret = def; FPlayer ret = def;
if (name != null) { if (name != null) {
FPlayer fplayer = FPlayers.i.get(name); OfflinePlayer player = Bukkit.getOfflinePlayer(name);
if (player.getName() != null) {
FPlayer fplayer = FPlayers.i.get(player);
if (fplayer != null) { if (fplayer != null) {
ret = fplayer; ret = fplayer;
} }
} }
}
if (msg && ret == null) { if (msg && ret == null) {
this.msg("<b>No player \"<p>%s<b>\" could be found.", name); this.msg("<b>No player \"<p>%s<b>\" could be found.", name);
@ -158,20 +161,7 @@ public abstract class FCommand extends MCommand<P> {
// BEST FPLAYER MATCH ====================== // BEST FPLAYER MATCH ======================
public FPlayer strAsBestFPlayerMatch(String name, FPlayer def, boolean msg) { public FPlayer strAsBestFPlayerMatch(String name, FPlayer def, boolean msg) {
FPlayer ret = def; return strAsFPlayer(name, def, msg);
if (name != null) {
FPlayer fplayer = FPlayers.i.getBestIdMatch(name);
if (fplayer != null) {
ret = fplayer;
}
}
if (msg && ret == null) {
this.msg("<b>No player match found for \"<p>%s<b>\".", name);
}
return ret;
} }
public FPlayer argAsBestFPlayerMatch(int idx, FPlayer def, boolean msg) { public FPlayer argAsBestFPlayerMatch(int idx, FPlayer def, boolean msg) {