TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 12:23:59 +00:00
Code Issues Projects Releases Wiki Activity

Kill people the proper way.

Browse source 
Test #1410
This commit is contained in:
KHobbits 2012-01-29 03:22:52 +00:00
parent 9ee78bdaec
commit a31f5e219d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/commands/Commandkill.java
View file

@ -31,7 +31,7 @@ public class Commandkill extends EssentialsCommand
continue; continue;
} }
matchPlayer.setHealth(0); matchPlayer.damage(1000);
sender.sendMessage(_("kill", matchPlayer.getDisplayName())); sender.sendMessage(_("kill", matchPlayer.getDisplayName()));
} }
} }

8
Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
View file

@ -3,6 +3,7 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.event.entity.EntityDamageEvent;
public class Commandsuicide extends EssentialsCommand public class Commandsuicide extends EssentialsCommand
@ -15,9 +16,10 @@ public class Commandsuicide extends EssentialsCommand
@Override @Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
user.setHealth(0); EntityDamageEvent ede = new EntityDamageEvent(user, EntityDamageEvent.DamageCause.SUICIDE, 1000);
server.getPluginManager().callEvent(ede);
user.damage(1000);
user.sendMessage(_("suicideMessage")); user.sendMessage(_("suicideMessage"));
ess.broadcastMessage(user, ess.broadcastMessage(user,_("suicideSuccess", user.getDisplayName()));
_("suicideSuccess", user.getDisplayName()));
} }
} }