minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-05 14:18:21 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into release

Browse Source
This commit is contained in:
KHobbits
2012-01-29 21:39:05 +00:00
parent 99b0261ae8 ae401f1fca
commit 61a66110cb
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Essentials/src/com/earth2me/essentials/commands/Commandkill.java
View File

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

1
Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
View File

@@ -19,6 +19,7 @@ public class Commandsuicide extends EssentialsCommand
EntityDamageEvent ede = new EntityDamageEvent(user, EntityDamageEvent.DamageCause.SUICIDE, 1000); EntityDamageEvent ede = new EntityDamageEvent(user, EntityDamageEvent.DamageCause.SUICIDE, 1000);
server.getPluginManager().callEvent(ede); server.getPluginManager().callEvent(ede);
user.damage(1000); user.damage(1000);
user.setHealth(0);
user.sendMessage(_("suicideMessage")); user.sendMessage(_("suicideMessage"));
ess.broadcastMessage(user,_("suicideSuccess", user.getDisplayName())); ess.broadcastMessage(user,_("suicideSuccess", user.getDisplayName()));
} }