diff options
| author | ementalo <ementalodev@gmx.co.uk> | 2012-07-17 12:26:55 +0100 |
|---|---|---|
| committer | ementalo <ementalodev@gmx.co.uk> | 2012-07-17 14:21:03 +0100 |
| commit | a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3 (patch) | |
| tree | 2aa10b6300f6c8d3cb2b298c124180fade74857a /Essentials/src/net/ess3/commands/Commandkill.java | |
| parent | 3c385e69271dfe8530fadc3f67e13ee495e4b0e1 (diff) | |
| parent | 9f05e43ecf8e6e1a8fcaef757678e762f0d82573 (diff) | |
| download | Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar.gz Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar.lz Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar.xz Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.zip | |
Merge of server-layer branch
Diffstat (limited to 'Essentials/src/net/ess3/commands/Commandkill.java')
| -rw-r--r-- | Essentials/src/net/ess3/commands/Commandkill.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandkill.java b/Essentials/src/net/ess3/commands/Commandkill.java index 401302177..0ab789af4 100644 --- a/Essentials/src/net/ess3/commands/Commandkill.java +++ b/Essentials/src/net/ess3/commands/Commandkill.java @@ -18,15 +18,14 @@ public class Commandkill extends EssentialsCommand for (Player matchPlayer : server.matchPlayer(args[0])) { - final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer, sender instanceof Player && ((Player)sender).getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, 1000); + final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer, sender instanceof Player && ((Player)sender).getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, Short.MAX_VALUE); server.getPluginManager().callEvent(ede); if (ede.isCancelled() && !sender.hasPermission("essentials.kill.force")) { continue; } - matchPlayer.damage(1000); - matchPlayer.setHealth(0); + matchPlayer.damage(Short.MAX_VALUE); sender.sendMessage(_("kill", matchPlayer.getDisplayName())); } } |