diff options
author | KHobbits <rob@khobbits.co.uk> | 2014-05-25 19:30:18 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2014-05-25 19:31:55 +0100 |
commit | 2d157c32384cb92310297ceae4fd557bfc2cf123 (patch) | |
tree | 1ed78fcad8612173f666d1f5b45053585cf69f9a | |
parent | d74770dcc4ab89561b615767c15bb188b6321989 (diff) | |
download | Essentials-2d157c32384cb92310297ceae4fd557bfc2cf123.tar Essentials-2d157c32384cb92310297ceae4fd557bfc2cf123.tar.gz Essentials-2d157c32384cb92310297ceae4fd557bfc2cf123.tar.lz Essentials-2d157c32384cb92310297ceae4fd557bfc2cf123.tar.xz Essentials-2d157c32384cb92310297ceae4fd557bfc2cf123.zip |
New permission: essentials.silentjoin.vanish
The server needs silentjoin to be enabled first.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java | 7 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/Settings.java | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 6eb4eb6cc..2b3f598df 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -279,9 +279,12 @@ public class EssentialsPlayerListener implements Listener user.getBase().setSleepingIgnored(true); } - if ((ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentjoin")) || message == null) + if ((ess.getSettings().allowSilentJoinQuit() && (user.isAuthorized("essentials.silentjoin") || user.isAuthorized("essentials.silentjoin.vanish"))) || message == null) { - // Do nothing - silently join + if (user.isAuthorized("essentials.silentjoin.vanish")) + { + user.setVanished(true); + } } else if (ess.getSettings().isCustomJoinMessage()) { diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index bedf97f4e..3ff5d0d4a 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -94,7 +94,6 @@ public class Settings implements net.ess3.api.ISettings { return chatRadius; } - // #easteregg private char chatShout = '!'; @@ -108,7 +107,6 @@ public class Settings implements net.ess3.api.ISettings { return chatShout; } - // #easteregg private char chatQuestion = '?'; @@ -122,7 +120,6 @@ public class Settings implements net.ess3.api.ISettings { return chatQuestion; } - private boolean teleportSafety; public boolean _isTeleportSafetyEnabled() @@ -563,7 +560,7 @@ public class Settings implements net.ess3.api.ISettings economyLog = _isEcoLogEnabled(); economyLogUpdate = _isEcoLogUpdateEnabled(); economyDisabled = _isEcoDisabled(); - allowSilentJoin = _isJoinQuitMessagesDisabled(); + allowSilentJoin = _allowSilentJoinQuit(); customJoinMessage = _getCustomJoinMessage(); isCustomJoinMessage = !customJoinMessage.equals("none"); customQuitMessage = _getCustomQuitMessage(); @@ -1163,9 +1160,9 @@ public class Settings implements net.ess3.api.ISettings } private boolean allowSilentJoin; - public boolean _isJoinQuitMessagesDisabled() + public boolean _allowSilentJoinQuit() { - return config.getBoolean("allow-silent-join-quit"); + return config.getBoolean("allow-silent-join-quit", false); } @Override |