diff options
| author | Iaccidentally <coryhuckaby@gmail.com> | 2013-04-19 14:48:45 -0400 |
|---|---|---|
| committer | Iaccidentally <coryhuckaby@gmail.com> | 2013-04-19 14:48:45 -0400 |
| commit | 4cf0843dd60d5c3d192efa35d6639b20a0fe39b8 (patch) | |
| tree | 406802cc149bf401a553ac9280f90f9b93e42c23 | |
| parent | a60573a8ace0832217545c71ab6c318278081ec8 (diff) | |
| download | Essentials-4cf0843dd60d5c3d192efa35d6639b20a0fe39b8.tar Essentials-4cf0843dd60d5c3d192efa35d6639b20a0fe39b8.tar.gz Essentials-4cf0843dd60d5c3d192efa35d6639b20a0fe39b8.tar.lz Essentials-4cf0843dd60d5c3d192efa35d6639b20a0fe39b8.tar.xz Essentials-4cf0843dd60d5c3d192efa35d6639b20a0fe39b8.zip | |
[3.0] Port kill exempt to 3.0
| -rw-r--r-- | Essentials/src/messages.properties | 1 | ||||
| -rw-r--r-- | Essentials/src/net/ess3/commands/Commandkill.java | 4 | ||||
| -rw-r--r-- | Essentials/src/net/ess3/permissions/Permissions.java | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 45c6a2e41..718ce306b 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -182,6 +182,7 @@ kickDefault=Kicked from server kickExempt=\u00a74You can not kick that person. kickedAll=\u00a74Kicked all players from server. kill=\u00a76Killed\u00a7c {0}\u00a76. +killExempt=\u00a74You can not kill {0} kitError2=\u00a74That kit does not exist or is improperly defined. kitError=\u00a74There are no valid kits. kitErrorHelp=\u00a74Perhaps an item is missing a quantity in the configuration? diff --git a/Essentials/src/net/ess3/commands/Commandkill.java b/Essentials/src/net/ess3/commands/Commandkill.java index b3b255f02..e6ed2a575 100644 --- a/Essentials/src/net/ess3/commands/Commandkill.java +++ b/Essentials/src/net/ess3/commands/Commandkill.java @@ -20,6 +20,10 @@ public class Commandkill extends EssentialsCommand for (IUser matchPlayer : ess.getUserMap().matchUsersExcludingHidden(args[0], getPlayerOrNull(sender))) { + if (Permissions.KILL_EXEMPT.isAuthorized(matchPlayer) && !Permissions.KILL_FORCE.isAuthorized(sender)) + { + throw new Exception(_("killExempt", matchPlayer.getName())); + } final Player player = matchPlayer.getPlayer(); final EntityDamageEvent ede = new EntityDamageEvent( player, sender instanceof IUser && sender.getName().equals( diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index fbacba29d..100c05127 100644 --- a/Essentials/src/net/ess3/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -68,6 +68,7 @@ public enum Permissions implements IPermission KICK_EXEMPT, KICK_NOTIFY, KILL_FORCE, + KILL_EXEMPT, LIST_HIDDEN, LIGHTNING_OTHERS, MAIL, |