From 8cc61d3b3388c17131be05cb9c7d14603fc07108 Mon Sep 17 00:00:00 2001 From: ementalo Date: Mon, 18 Jun 2012 12:00:16 +0100 Subject: [PATCH] Fix /lightning to actually deal the proper set damage (5 or 25% by default) --- .../essentials/commands/Commandlightning.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java index 3eda786c9..b4dab9691 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java @@ -32,7 +32,7 @@ public class Commandlightning extends EssentialsCommand throw new Exception(_("playerNotFound")); } - int power = 1; + int power = 5; if (args.length > 1) { try @@ -47,18 +47,10 @@ public class Commandlightning extends EssentialsCommand for (Player matchPlayer : server.matchPlayer(args[0])) { sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName())); - if (power <= 0) - { - matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation()); - } - else - { - LightningStrike strike = matchPlayer.getWorld().strikeLightning(matchPlayer.getLocation()); - matchPlayer.damage(power - 1, strike); - } + final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation()); if (!ess.getUser(matchPlayer).isGodModeEnabled()) { - matchPlayer.setHealth(matchPlayer.getHealth() < 5 ? 0 : matchPlayer.getHealth() - 5); + matchPlayer.damage(power, strike); } @Cleanup final ISettings settings = ess.getSettings();