diff options
Diffstat (limited to 'Essentials/src/net/ess3/commands/Commandkill.java')
| -rw-r--r-- | Essentials/src/net/ess3/commands/Commandkill.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandkill.java b/Essentials/src/net/ess3/commands/Commandkill.java index 7875616f1..a098f8096 100644 --- a/Essentials/src/net/ess3/commands/Commandkill.java +++ b/Essentials/src/net/ess3/commands/Commandkill.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.Player; +import net.ess3.api.IUser; +import org.bukkit.command.CommandSender; import org.bukkit.event.entity.EntityDamageEvent; @@ -16,17 +16,17 @@ public class Commandkill extends EssentialsCommand throw new NotEnoughArgumentsException(); } - for (Player matchPlayer : ess.getUserMap().matchUsers(args[0], false, false)) + for (IUser matchPlayer : ess.getUserMap().matchUsers(args[0], false, false)) { - final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer, sender instanceof Player && ((Player)sender).getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, Short.MAX_VALUE); + final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer.getPlayer(), sender instanceof IUser && 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(Short.MAX_VALUE); - sender.sendMessage(_("kill", matchPlayer.getDisplayName())); + matchPlayer.getPlayer().damage(Short.MAX_VALUE); + sender.sendMessage(_("kill", matchPlayer.getPlayer().getDisplayName())); } } } |