summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul A. <ementalodev@gmx.co.uk>2013-04-02 08:34:08 -0700
committerPaul A. <ementalodev@gmx.co.uk>2013-04-02 08:34:08 -0700
commitc78ec4fed2a156685dfc8ac675336135f1d4219a (patch)
treef8456548891563a9ea92eebcd018cc19bfa92f54
parent5601cb7e28ec28abde1ce11cedbd0d7cf29021ff (diff)
parentfe51c55d0a2045516e1e08c243d6e785bbfa559e (diff)
downloadEssentials-c78ec4fed2a156685dfc8ac675336135f1d4219a.tar
Essentials-c78ec4fed2a156685dfc8ac675336135f1d4219a.tar.gz
Essentials-c78ec4fed2a156685dfc8ac675336135f1d4219a.tar.lz
Essentials-c78ec4fed2a156685dfc8ac675336135f1d4219a.tar.xz
Essentials-c78ec4fed2a156685dfc8ac675336135f1d4219a.zip
Merge pull request #436 from GunfighterJ/master
[Fix] NPE on ptime from console
-rw-r--r--Essentials/src/net/ess3/commands/Commandptime.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java
index c82ad3669..37a240e94 100644
--- a/Essentials/src/net/ess3/commands/Commandptime.java
+++ b/Essentials/src/net/ess3/commands/Commandptime.java
@@ -41,7 +41,7 @@ public class Commandptime extends EssentialsCommand
}
IUser user = isUser(sender) ? getUser(sender) : null;
- if ((!users.contains(user) || users.size() > 1) && user != null && !Permissions.PTIME_OTHERS.isAuthorized(user))
+ if (user != null && (!users.contains(user) || users.size() > 1) && !Permissions.PTIME_OTHERS.isAuthorized(user))
{
user.sendMessage(_("pTimeOthersPermission"));
return;