Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-28 19:11:53 +01:00
Code Issues Projects Releases Wiki Activity

Properly apply damage causes

Browse Source
This commit is contained in:
ShadowRanger 2015-09-28 11:45:25 +10:00
parent 8485bd44f9
commit 7d6714f713
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ public class Commandkill extends EssentialsLoopCommand {
if (ede.isCancelled() && sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.kill.force")) { if (ede.isCancelled() && sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.kill.force")) {
return; return;
} }
ede.getEntity().setLastDamageCause(ede);
matchPlayer.damage(Short.MAX_VALUE); matchPlayer.damage(Short.MAX_VALUE);
if (matchPlayer.getHealth() > 0) { if (matchPlayer.getHealth() > 0) {

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

@ -16,6 +16,7 @@ public class Commandsuicide extends EssentialsCommand {
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 {
EntityDamageEvent ede = new EntityDamageEvent(user.getBase(), EntityDamageEvent.DamageCause.SUICIDE, Short.MAX_VALUE); EntityDamageEvent ede = new EntityDamageEvent(user.getBase(), EntityDamageEvent.DamageCause.SUICIDE, Short.MAX_VALUE);
server.getPluginManager().callEvent(ede); server.getPluginManager().callEvent(ede);
ede.getEntity().setLastDamageCause(ede);
user.getBase().damage(Short.MAX_VALUE); user.getBase().damage(Short.MAX_VALUE);
if (user.getBase().getHealth() > 0) { if (user.getBase().getHealth() > 0) {
user.getBase().setHealth(0); user.getBase().setHealth(0);