summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul A. <ementalodev@gmx.co.uk>2013-04-02 08:31:42 -0700
committerPaul A. <ementalodev@gmx.co.uk>2013-04-02 08:31:42 -0700
commit11fafb533975b7f0a03200bc3409e963d10897cf (patch)
treecd62d6a0db234b272e6c6589a6723ac644b61ad1
parent93b76446f549ccbd03ce559fca3a191f61e8fc4f (diff)
parente4b04db412875c132a6fb8a991f9cec196598c65 (diff)
downloadEssentials-11fafb533975b7f0a03200bc3409e963d10897cf.tar
Essentials-11fafb533975b7f0a03200bc3409e963d10897cf.tar.gz
Essentials-11fafb533975b7f0a03200bc3409e963d10897cf.tar.lz
Essentials-11fafb533975b7f0a03200bc3409e963d10897cf.tar.xz
Essentials-11fafb533975b7f0a03200bc3409e963d10897cf.zip
Merge pull request #435 from GunfighterJ/2.9
[Fix] NPE on ptime from console
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandptime.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
index 866846733..46548c57c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
@@ -46,7 +46,7 @@ public class Commandptime extends EssentialsCommand
}
User user = ess.getUser(sender);
- if ((!users.contains(user) || users.size() > 1) && user != null && !user.isAuthorized("essentials.ptime.others"))
+ if (user != null && (!users.contains(user) || users.size() > 1)&& !user.isAuthorized("essentials.ptime.others"))
{
user.sendMessage(_("pTimeOthersPermission"));
return;