Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-04 06:21:35 +01:00
Code Issues Projects Releases Wiki Activity

Restore getUser API

Browse Source
This commit is contained in:
KHobbits 2013-10-17 23:55:42 +01:00
parent 6f85761f7f
commit be31b1695d
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@ -610,11 +610,25 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
this.metrics = metrics; this.metrics = metrics;
} }
@Deprecated
@Override
public User getUser(final Object base)
{
if (base instanceof Player)
{
return getUser((Player)base);
}
if (base instanceof String)
{
return getOfflineUser((String)base);
}
return null;
}
@Override @Override
public User getUser(final String base) public User getUser(final String base)
{ {
return getOfflineUser((String)base); return getOfflineUser((String)base);
} }
@Override @Override

3
Essentials/src/com/earth2me/essentials/IEssentials.java
View File

@ -24,6 +24,9 @@ public interface IEssentials extends Plugin
boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module); boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);
@Deprecated
User getUser(Object base);
User getUser(String base); User getUser(String base);
User getUser(Player base); User getUser(Player base);

4
Essentials/src/com/earth2me/essentials/commands/Commandr.java
View File

@ -44,9 +44,9 @@ public class Commandr extends EssentialsCommand
} }
final CommandSource target = replyTo.getReplyTo(); final CommandSource target = replyTo.getReplyTo();
final String targetName = target instanceof Player ? ((Player)target).getDisplayName() : Console.NAME; final String targetName = target.isPlayer() ? target.getPlayer().getDisplayName() : Console.NAME;
if (target == null || ((target instanceof Player) && !((Player)target).isOnline())) if (target == null || (target.isPlayer() && !target.getPlayer().isOnline()))
{ {
throw new Exception(_("foreverAlone")); throw new Exception(_("foreverAlone"));
} }