TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-05 12:02:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #195 from evonuts/2.9

Browse source 
Update fly command to allow for /fly on|*ena*|1 and inversely, /fly off|...
This commit is contained in:
Iaccidentally 2012-11-11 14:21:18 -08:00
commit 5728f964a5
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Essentials/src/com/earth2me/essentials/commands/Commandfly.java
View file

@ -28,15 +28,34 @@ public class Commandfly extends EssentialsCommand
@Override @Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length > 0 && args[0].trim().length() > 2 && user.isAuthorized("essentials.fly.others")) if (args.length == 1)
{
if (args[0].equalsIgnoreCase("on") || args[0].startsWith("ena") || args[0].equalsIgnoreCase("1"))
{
user.setAllowFlight(true);
}
else if (args[0].equalsIgnoreCase("off") || args[0].startsWith("dis") || args[0].equalsIgnoreCase("0"))
{
user.setAllowFlight(false);
}
else if (user.isAuthorized("essentials.fly.others"))
{
flyOtherPlayers(server, user, args);
return;
}
}
else if (args.length == 2 && user.isAuthorized("essentials.fly.others"))
{ {
flyOtherPlayers(server, user, args); flyOtherPlayers(server, user, args);
return; return;
} }
user.setAllowFlight(!user.getAllowFlight()); else
if (!user.getAllowFlight())
{ {
user.setFlying(false); user.setAllowFlight(!user.getAllowFlight());
if (!user.getAllowFlight())
{
user.setFlying(false);
}
} }
user.sendMessage(_("flyMode", _(user.getAllowFlight() ? "enabled" : "disabled"), user.getDisplayName())); user.sendMessage(_("flyMode", _(user.getAllowFlight() ? "enabled" : "disabled"), user.getDisplayName()));
} }