summaryrefslogtreecommitdiffstats
path: root/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-10-26 21:34:36 +0100
committerKHobbits <rob@khobbits.co.uk>2012-10-26 21:34:36 +0100
commit0acaff8a85da676b6d67223e14b6f726bf88c368 (patch)
treec4d42cfcac89754a7ba20c3a61db2cf034814e7e /Essentials/src/com/earth2me/essentials/commands/Commandmail.java
parent2dccfdb53cb6958790dd4c73fab369aa9072d9d1 (diff)
downloadEssentials-0acaff8a85da676b6d67223e14b6f726bf88c368.tar
Essentials-0acaff8a85da676b6d67223e14b6f726bf88c368.tar.gz
Essentials-0acaff8a85da676b6d67223e14b6f726bf88c368.tar.lz
Essentials-0acaff8a85da676b6d67223e14b6f726bf88c368.tar.xz
Essentials-0acaff8a85da676b6d67223e14b6f726bf88c368.zip
Reduce calls to bukkit getPlayer();
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/commands/Commandmail.java')
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandmail.java33
1 files changed, 3 insertions, 30 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
index e2c95afab..66d8ced17 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
@@ -45,16 +45,7 @@ public class Commandmail extends EssentialsCommand
throw new Exception(_("noPerm", "essentials.mail.send"));
}
- Player player = server.getPlayer(args[1]);
- User u;
- if (player != null)
- {
- u = ess.getUser(player);
- }
- else
- {
- u = ess.getOfflineUser(args[1]);
- }
+ User u = ess.getUser(args[0]);
if (u == null)
{
throw new Exception(_("playerNeverOnServer", args[1]));
@@ -113,16 +104,7 @@ public class Commandmail extends EssentialsCommand
}
else if (args.length >= 3 && "send".equalsIgnoreCase(args[0]))
{
- Player player = server.getPlayer(args[1]);
- User u;
- if (player != null)
- {
- u = ess.getUser(player);
- }
- else
- {
- u = ess.getOfflineUser(args[1]);
- }
+ User u = ess.getUser(args[0]);
if (u == null)
{
throw new Exception(_("playerNeverOnServer", args[1]));
@@ -138,16 +120,7 @@ public class Commandmail extends EssentialsCommand
else if (args.length >= 2)
{
//allow sending from console without "send" argument, since it's the only thing the console can do
- Player player = server.getPlayer(args[0]);
- User u;
- if (player != null)
- {
- u = ess.getUser(player);
- }
- else
- {
- u = ess.getOfflineUser(args[0]);
- }
+ User u = ess.getUser(args[0]);
if (u == null)
{
throw new Exception(_("playerNeverOnServer", args[0]));