diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-03-17 06:38:12 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-03-17 06:38:24 +0000 |
| commit | 2b5f21d47150e0dbc5e728c13107efb15ab4d374 (patch) | |
| tree | 4be14368922ec658a7a987f72427071c8732e29f | |
| parent | e483d61f69939bfaecf0b987a3e1c242158c42c3 (diff) | |
| download | Essentials-2b5f21d47150e0dbc5e728c13107efb15ab4d374.tar Essentials-2b5f21d47150e0dbc5e728c13107efb15ab4d374.tar.gz Essentials-2b5f21d47150e0dbc5e728c13107efb15ab4d374.tar.lz Essentials-2b5f21d47150e0dbc5e728c13107efb15ab4d374.tar.xz Essentials-2b5f21d47150e0dbc5e728c13107efb15ab4d374.zip | |
[Fix] Restore /speed command's ability to control walk speed.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandspeed.java | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspeed.java b/Essentials/src/com/earth2me/essentials/commands/Commandspeed.java index 8415241b1..c7b44dc68 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspeed.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandspeed.java @@ -39,38 +39,30 @@ public class Commandspeed extends EssentialsCommand boolean isBypass = user.isAuthorized("essentials.speed.bypass"); if (args.length == 1) { - //isFly = user.isFlying(); - isFly = true; + isFly = user.isFlying(); speed = getMoveSpeed(args[0]); } else { - //isFly = isFlyMode(args[0]); - //speed = getMoveSpeed(args[1]); - //if (args.length > 2 && user.isAuthorized("essentials.speed.others")) - //{ - // speedOtherPlayers(server, user, isFly, isBypass, speed, args[2]); - // return; - //} - isFly = true; - speed = getMoveSpeed(args[0]); - if (user.isAuthorized("essentials.speed.others")) + isFly = isFlyMode(args[0]); + speed = getMoveSpeed(args[1]); + if (args.length > 2 && user.isAuthorized("essentials.speed.others")) { - speedOtherPlayers(server, user, isFly, isBypass, speed, args[1]); + speedOtherPlayers(server, user, isFly, isBypass, speed, args[2]); return; } } - //if (isFly) - //{ + if (isFly) + { user.setFlySpeed(getRealMoveSpeed(speed, isFly, isBypass)); user.sendMessage(_("moveSpeed", _("flying"), speed, user.getDisplayName())); - //} - //else - //{ - // user.setWalkSpeed(getRealMoveSpeed(speed, isFly, isBypass)); - // user.sendMessage(_("moveSpeed", _("walking"), speed, user.getDisplayName())); - //} + } + else + { + user.setWalkSpeed(getRealMoveSpeed(speed, isFly, isBypass)); + user.sendMessage(_("moveSpeed", _("walking"), speed, user.getDisplayName())); + } } private void speedOtherPlayers(final Server server, final CommandSender sender, final boolean isFly, final boolean isBypass, final float speed, final String target) |