1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-03 13:17:38 +02:00

Merge branch 'master' into release

This commit is contained in:
KHobbits
2012-01-29 21:39:05 +00:00
2 changed files with 3 additions and 1 deletions

View File

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

View File

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