minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-27 08:24:44 +02:00
Code Issues Releases Wiki Activity

General cleanup

Browse Source
This commit is contained in:
KHobbits
2012-12-02 02:54:32 +00:00
parent ce25abc3d8
commit c5dccc5229
7 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Essentials/src/net/ess3/commands/Commandfly.java
View File

@@ -24,10 +24,12 @@ public class Commandfly extends EssentialsToggleCommand
protected void informSender(final CommandSender sender, final boolean value, final IUser player) protected void informSender(final CommandSender sender, final boolean value, final IUser player)
{ {
if (value) { if (value)
{
sender.sendMessage(_("flyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName())); sender.sendMessage(_("flyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
} }
else { else
{
//TODO: TL this //TODO: TL this
sender.sendMessage("Can't change fly mode for player " + player.getName()); sender.sendMessage("Can't change fly mode for player " + player.getName());
} }
@@ -39,7 +41,7 @@ public class Commandfly extends EssentialsToggleCommand
player.sendMessage(message); player.sendMessage(message);
} }
protected boolean canToggleOthers(final IUser user) protected boolean canEditOthers(final IUser user)
{ {
return Permissions.FLY_OTHERS.isAuthorized(user); return Permissions.FLY_OTHERS.isAuthorized(user);
} }

2
Essentials/src/net/ess3/commands/Commandgamemode.java
View File

@@ -41,7 +41,7 @@ public class Commandgamemode extends EssentialsSettingsCommand
player.sendMessage(message); player.sendMessage(message);
} }
protected boolean canToggleOthers(final IUser user) protected boolean canEditOthers(final IUser user)
{ {
return Permissions.GAMEMODE_OTHERS.isAuthorized(user); return Permissions.GAMEMODE_OTHERS.isAuthorized(user);
} }

11
Essentials/src/net/ess3/commands/Commandgod.java
View File

@@ -1,9 +1,10 @@
package net.ess3.commands; package net.ess3.commands;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import org.bukkit.command.CommandSender;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import org.bukkit.command.CommandSender;
public class Commandgod extends EssentialsToggleCommand public class Commandgod extends EssentialsToggleCommand
{ {
@@ -20,10 +21,12 @@ public class Commandgod extends EssentialsToggleCommand
protected void informSender(final CommandSender sender, final boolean value, final IUser player) protected void informSender(final CommandSender sender, final boolean value, final IUser player)
{ {
if (value) { if (value)
{
sender.sendMessage(_("godMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName())); sender.sendMessage(_("godMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
} }
else { else
{
//TODO: TL this //TODO: TL this
sender.sendMessage("Can't change god mode for player " + player.getName()); sender.sendMessage("Can't change god mode for player " + player.getName());
} }
@@ -35,7 +38,7 @@ public class Commandgod extends EssentialsToggleCommand
player.sendMessage(message); player.sendMessage(message);
} }
protected boolean canToggleOthers(final IUser user) protected boolean canEditOthers(final IUser user)
{ {
return Permissions.GOD_OTHERS.isAuthorized(user); return Permissions.GOD_OTHERS.isAuthorized(user);
} }

2
Essentials/src/net/ess3/commands/Commandsocialspy.java
View File

@@ -37,7 +37,7 @@ public class Commandsocialspy extends EssentialsToggleCommand
player.sendMessage(message); player.sendMessage(message);
} }
protected boolean canToggleOthers(final IUser user) protected boolean canEditOthers(final IUser user)
{ {
return Permissions.SOCIALSPY_OTHERS.isAuthorized(user); return Permissions.SOCIALSPY_OTHERS.isAuthorized(user);
} }

8
Essentials/src/net/ess3/commands/Commandtptoggle.java
View File

@@ -22,10 +22,12 @@ public class Commandtptoggle extends EssentialsToggleCommand
protected void informSender(final CommandSender sender, final boolean value, final IUser player) protected void informSender(final CommandSender sender, final boolean value, final IUser player)
{ {
if (value) { if (value)
{
sender.sendMessage(_("teleportMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName())); sender.sendMessage(_("teleportMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
} }
else { else
{
//TODO: TL this //TODO: TL this
sender.sendMessage("Can't change teleport toggle for player " + player.getName()); sender.sendMessage("Can't change teleport toggle for player " + player.getName());
} }
@@ -37,7 +39,7 @@ public class Commandtptoggle extends EssentialsToggleCommand
player.sendMessage(message); player.sendMessage(message);
} }
protected boolean canToggleOthers(final IUser user) protected boolean canEditOthers(final IUser user)
{ {
return Permissions.TPTOGGLE_OTHERS.isAuthorized(user); return Permissions.TPTOGGLE_OTHERS.isAuthorized(user);
} }

8
Essentials/src/net/ess3/commands/Commandvanish.java
View File

@@ -20,10 +20,12 @@ public class Commandvanish extends EssentialsToggleCommand
protected void informSender(final CommandSender sender, final boolean value, final IUser player) protected void informSender(final CommandSender sender, final boolean value, final IUser player)
{ {
if (value) { if (value)
{
sender.sendMessage(_("vanishMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName())); sender.sendMessage(_("vanishMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
} }
else { else
{
//TODO: TL this //TODO: TL this
sender.sendMessage("Can't change vanish mode for player " + player.getName()); sender.sendMessage("Can't change vanish mode for player " + player.getName());
} }
@@ -34,7 +36,7 @@ public class Commandvanish extends EssentialsToggleCommand
player.sendMessage(getValue(player) ? _("vanished") : _("unvanished")); player.sendMessage(getValue(player) ? _("vanished") : _("unvanished"));
} }
protected boolean canToggleOthers(final IUser user) protected boolean canEditOthers(final IUser user)
{ {
return Permissions.VANISH_OTHERS.isAuthorized(user); return Permissions.VANISH_OTHERS.isAuthorized(user);
} }

14
Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java
View File

@@ -13,7 +13,7 @@ public abstract class EssentialsSettingsCommand extends EssentialsCommand
abstract protected void informPlayer(final IUser player); abstract protected void informPlayer(final IUser player);
abstract protected boolean canToggleOthers(final IUser user); abstract protected boolean canEditOthers(final IUser user);
abstract protected boolean isExempt(final CommandSender sender, final IUser player); abstract protected boolean isExempt(final CommandSender sender, final IUser player);
@@ -34,15 +34,15 @@ public abstract class EssentialsSettingsCommand extends EssentialsCommand
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
toggleOtherPlayers(server, sender, args); editOtherPlayers(server, sender, args);
} }
@Override @Override
protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length > 1 && args[0].trim().length() > 2 && canToggleOthers(user)) if (args.length > 1 && args[0].trim().length() > 2 && canEditOthers(user))
{ {
toggleOtherPlayers(server, user, args); editOtherPlayers(server, user, args);
return; return;
} }
else if (args.length > 0) else if (args.length > 0)
@@ -51,9 +51,9 @@ public abstract class EssentialsSettingsCommand extends EssentialsCommand
{ {
playerMatch(user, args[0]); playerMatch(user, args[0]);
} }
else if (args[0].trim().length() > 2 && canToggleOthers(user)) else if (args[0].trim().length() > 2 && canEditOthers(user))
{ {
toggleOtherPlayers(server, user, args); editOtherPlayers(server, user, args);
return; return;
} }
} }
@@ -64,7 +64,7 @@ public abstract class EssentialsSettingsCommand extends EssentialsCommand
informPlayer(user); informPlayer(user);
} }
private void toggleOtherPlayers(final Server server, final CommandSender sender, final String[] args) throws NotEnoughArgumentsException private void editOtherPlayers(final Server server, final CommandSender sender, final String[] args) throws NotEnoughArgumentsException
{ {
Set<IUser> matches = toggleOfflinePlayers() ? ess.getUserMap().matchUsers(args[0], true) : ess.getUserMap().matchUsersExcludingHidden( Set<IUser> matches = toggleOfflinePlayers() ? ess.getUserMap().matchUsers(args[0], true) : ess.getUserMap().matchUsersExcludingHidden(
args[0], getPlayerOrNull(sender)); args[0], getPlayerOrNull(sender));