minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-25 23:46:15 +02:00
Code Issues Releases Wiki Activity

Fix /lightning <player> <damage> to actually deal the proper set damage (5 or 25% by default)

Browse Source
This commit is contained in:
ementalo
2012-06-18 12:00:16 +01:00
parent 6677f75c52
commit 8cc61d3b33
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
View File

@@ -32,7 +32,7 @@ public class Commandlightning extends EssentialsCommand
throw new Exception(_("playerNotFound")); throw new Exception(_("playerNotFound"));
} }
int power = 1; int power = 5;
if (args.length > 1) if (args.length > 1)
{ {
try try
@@ -47,18 +47,10 @@ public class Commandlightning extends EssentialsCommand
for (Player matchPlayer : server.matchPlayer(args[0])) for (Player matchPlayer : server.matchPlayer(args[0]))
{ {
sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName())); sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName()));
if (power <= 0) final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
{
matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
}
else
{
LightningStrike strike = matchPlayer.getWorld().strikeLightning(matchPlayer.getLocation());
matchPlayer.damage(power - 1, strike);
}
if (!ess.getUser(matchPlayer).isGodModeEnabled()) if (!ess.getUser(matchPlayer).isGodModeEnabled())
{ {
matchPlayer.setHealth(matchPlayer.getHealth() < 5 ? 0 : matchPlayer.getHealth() - 5); matchPlayer.damage(power, strike);
} }
@Cleanup @Cleanup
final ISettings settings = ess.getSettings(); final ISettings settings = ess.getSettings();