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
commita3ef2d298c24e03e148bc12855d8e41fe27daa04 (patch)
tree6b8f621654624c09204984e1e90a28f1f4feb144
parent05cc2c33bd426ce5ec870fc60a9c4b6060d93ad9 (diff)
parentb887bd4e532a9100f60d69a92037d6bd0603ed01 (diff)
downloadEssentials-a3ef2d298c24e03e148bc12855d8e41fe27daa04.tar
Essentials-a3ef2d298c24e03e148bc12855d8e41fe27daa04.tar.gz
Essentials-a3ef2d298c24e03e148bc12855d8e41fe27daa04.tar.lz
Essentials-a3ef2d298c24e03e148bc12855d8e41fe27daa04.tar.xz
Essentials-a3ef2d298c24e03e148bc12855d8e41fe27daa04.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;