minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 18:14:38 +02:00
Code Issues Releases Wiki Activity

Revert "more replacing. fix getUser();"

Browse Source 
This reverts commit ab9545624c.
This commit is contained in:
ementalo
2012-07-17 20:48:05 +01:00
parent ab9545624c
commit ea1cce76f9
32 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ public class Commandafk extends EssentialsCommand
{
if (args.length > 0 && Permissions.AFK_OTHERS.isAuthorized(user))
{
IUser afkUser = player.getUser((Player)ess.getServer().matchPlayer(args[0]));
IUser afkUser = ess.getUser((Player)ess.getServer().matchPlayer(args[0]));
if (afkUser != null)
{
toggleAfk(afkUser);

1
Essentials/src/net/ess3/commands/Commandban.java
View File

@@ -7,7 +7,6 @@ import net.ess3.permissions.Permissions;
import net.ess3.user.Ban;
import lombok.Cleanup;
import net.ess3.api.server.CommandSender;
import net.ess3.api.server.Player;
public class Commandban extends EssentialsCommand

3
Essentials/src/net/ess3/commands/Commandbanip.java
View File

@@ -4,7 +4,6 @@ import static net.ess3.I18n._;
import net.ess3.api.IUser;
import lombok.Cleanup;
import net.ess3.api.server.CommandSender;
import net.ess3.api.server.Player;
public class Commandbanip extends EssentialsCommand
@@ -18,7 +17,7 @@ public class Commandbanip extends EssentialsCommand
}
@Cleanup
final IUser player = player.getUser(args[0]);
final IUser player = ess.getUser(args[0]);
player.acquireReadLock();
if (player == null)

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

@@ -20,7 +20,7 @@ public class Commanddelhome extends EssentialsCommand
}
@Cleanup
IUser user = sender instanceof Player ? player.getUser((Player)sender) : null;
IUser user = sender instanceof Player ? ess.getUser((Player)sender) : null;
String name;
String[] expandedArg;

4
Essentials/src/net/ess3/commands/Commandeco.java
View File

@@ -33,9 +33,9 @@ public class Commandeco extends EssentialsCommand
if (args[1].contentEquals("**"))
{
for (String sUser : userMap.matchUser().getAllUniqueUsers())
for (String sUser : ess.getUserMap().getAllUniqueUsers())
{
final IUser player = Player.getUser(sUser);
final IUser player = ess.getUser(sUser);
switch (cmd)
{
case GIVE:

4
Essentials/src/net/ess3/commands/Commandexp.java
View File

@@ -91,7 +91,7 @@ public class Commandexp extends EssentialsCommand
for (Player matchPlayer : server.matchPlayer(match))
{
foundUser = true;
final IUser target = player.getUser(matchPlayer);
final IUser target = ess.getUser(matchPlayer);
showExp(sender, target);
}
if (!foundUser)
@@ -105,7 +105,7 @@ public class Commandexp extends EssentialsCommand
boolean foundUser = false;
for (Player matchPlayer : server.matchPlayer(match))
{
final IUser target = player.getUser(matchPlayer);
final IUser target = ess.getUser(matchPlayer);
setExp(sender, target, amount, toggle);
foundUser = true;
}

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

@@ -35,7 +35,7 @@ public class Commandfeed extends EssentialsCommand
}
for (Player player : players)
{
if (player.getUser(player).isHidden())
if (ess.getUser(player).isHidden())
{
continue;
}

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

@@ -4,7 +4,7 @@ import static net.ess3.I18n._;
import net.ess3.api.IUser;
import net.ess3.api.server.CommandSender;
import net.ess3.api.server.Player;
import net.ess3.api.server.IServer;
import net.ess3.api.IServer
import net.ess3.permissions.Permissions;
@@ -43,7 +43,7 @@ public class Commandfly extends EssentialsCommand
{
for (Player matchPlayer : server.matchPlayer(args[0]))
{
final IUser player = player.getUser(matchPlayer);
final IUser player = ess.getUser(matchPlayer);
if (player.isHidden())
{
continue;

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

@@ -39,7 +39,7 @@ public class Commandgamemode extends EssentialsCommand
{
for (Player matchPlayer : server.matchPlayer(args[0]))
{
final IUser player = player.getUser(matchPlayer);
final IUser player = ess.getUser(matchPlayer);
if (player.isHidden())
{
continue;

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

@@ -53,7 +53,7 @@ public class Commandgive extends EssentialsCommand
{
continue;
}
final Enchantment enchantment = Commandenchant.getEnchantment(split[0], sender instanceof Player ? player.getUser((Player)sender) : null);
final Enchantment enchantment = Commandenchant.getEnchantment(split[0], sender instanceof Player ? ess.getUser((Player)sender) : null);
int level;
if (split.length > 1)
{

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

@@ -38,7 +38,7 @@ public class Commandgod extends EssentialsCommand
{
for (Player matchPlayer : server.matchPlayer(args[0]))
{
final IUser player = player.getUser(matchPlayer);
final IUser player = ess.getUser(matchPlayer);
if (player.isHidden())
{
continue;

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

@@ -53,7 +53,7 @@ public class Commandheal extends EssentialsCommand
}
for (Player p : players)
{
if (player.getUser(p).isHidden())
if (ess.getUser(p).isHidden())
{
continue;
}

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

@@ -20,7 +20,7 @@ public class Commandignore extends EssentialsCommand
}
catch (NoSuchFieldException ex)
{
player = player.getUser(args[0]);
player = ess.getUser(args[0]);
}
if (player == null)
{

4
Essentials/src/net/ess3/commands/Commandlightning.java
View File

@@ -20,7 +20,7 @@ public class Commandlightning extends EssentialsCommand
IUser user = null;
if (sender instanceof Player)
{
user = player.getUser(((Player)sender));
user = ess.getUser(((Player)sender));
}
if ((args.length < 1 || !Permissions.LIGHTNING_OTHERS.isAuthorized(user)) && user != null)
{
@@ -49,7 +49,7 @@ public class Commandlightning extends EssentialsCommand
{
sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName()));
final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
if (!player.getUser(matchPlayer).isGodModeEnabled())
if (!ess.getUser(matchPlayer).isGodModeEnabled())
{
matchPlayer.damage(power, strike);
}

12
Essentials/src/net/ess3/commands/Commandmail.java
View File

@@ -42,11 +42,11 @@ public class Commandmail extends EssentialsCommand
IUser u;
if (player != null)
{
u = player.getUser(player);
u = ess.getUser(player);
}
else
{
u = player.getUser(args[1]);
u = ess.getUser(args[1]);
}
if (u == null)
{
@@ -97,11 +97,11 @@ public class Commandmail extends EssentialsCommand
IUser u;
if (player != null)
{
u = player.getUser(player);
u = ess.getUser(player);
}
else
{
u = player.getUser(args[1]);
u = ess.getUser(args[1]);
}
if (u == null)
{
@@ -122,11 +122,11 @@ public class Commandmail extends EssentialsCommand
IUser u;
if (player != null)
{
u = player.getUser(player);
u = ess.getUser(player);
}
else
{
u = player.getUser(args[0]);
u = ess.getUser(args[0]);
}
if (u == null)
{

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

@@ -27,7 +27,7 @@ public class Commandmsg extends EssentialsCommand
if (sender instanceof Player)
{
@Cleanup
IUser user = player.getUser((Player)sender);
IUser user = ess.getUser((Player)sender);
user.acquireReadLock();
if (user.getData().isMuted())
{
@@ -49,7 +49,7 @@ public class Commandmsg extends EssentialsCommand
final String translatedMe = _("me");
final IReplyTo replyTo = sender instanceof Player ? player.getUser((Player)sender) : Console.getConsoleReplyTo();
final IReplyTo replyTo = sender instanceof Player ? ess.getUser((Player)sender) : Console.getConsoleReplyTo();
final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
if (args[0].equalsIgnoreCase(Console.NAME))
@@ -72,7 +72,7 @@ public class Commandmsg extends EssentialsCommand
int i = 0;
for (Player matchedPlayer : matchedPlayers)
{
final IUser u = player.getUser(matchedPlayer);
final IUser u = ess.getUser(matchedPlayer);
if (u.isHidden())
{
i++;
@@ -86,14 +86,14 @@ public class Commandmsg extends EssentialsCommand
for (Player matchedPlayer : matchedPlayers)
{
sender.sendMessage(_("msgFormat", translatedMe, matchedPlayer.getDisplayName(), message));
final IUser matchedUser = player.getUser(matchedPlayer);
if (sender instanceof Player && (matchedUser.isIgnoringPlayer(player.getUser((Player)sender)) || matchedUser.isHidden()))
final IUser matchedUser = ess.getUser(matchedPlayer);
if (sender instanceof Player && (matchedUser.isIgnoringPlayer(ess.getUser((Player)sender)) || matchedUser.isHidden()))
{
continue;
}
matchedPlayer.sendMessage(_("msgFormat", senderName, translatedMe, message));
replyTo.setReplyTo(player.getUser(matchedPlayer));
player.getUser(matchedPlayer).setReplyTo(sender);
replyTo.setReplyTo(ess.getUser(matchedPlayer));
ess.getUser(matchedPlayer).setReplyTo(sender);
}
}
}

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

@@ -86,7 +86,7 @@ public class Commandnear extends EssentialsCommand
for (Player onlinePlayer : server.getOnlinePlayers())
{
final IUser player = player.getUser(onlinePlayer);
final IUser player = ess.getUser(onlinePlayer);
if (!player.equals(user) && !player.isHidden())
{
final Location playerLoc = player.getLocation();

4
Essentials/src/net/ess3/commands/Commandnick.java
View File

@@ -7,7 +7,7 @@ import net.ess3.api.ISettings;
import net.ess3.api.IUser;
import net.ess3.api.server.CommandSender;
import net.ess3.api.server.Player;
import net.ess3.api.server.IServer;
import net.ess3.api.IServer
import net.ess3.permissions.Permissions;
import net.ess3.utils.Util;
@@ -84,7 +84,7 @@ public class Commandnick extends EssentialsCommand
{
try
{
setNickname(player.getUser(player), "off");
setNickname(ess.getUser(player), "off");
}
catch (Exception ex)
{

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

@@ -27,7 +27,7 @@ public class Commandpay extends EssentialsCommand
boolean foundUser = false;
for (Player p : server.matchPlayer(args[0]))
{
IUser u = player.getUser(p);
IUser u = ess.getUser(p);
if (u.isHidden())
{
continue;

10
Essentials/src/net/ess3/commands/Commandptime.java
View File

@@ -41,7 +41,7 @@ public class Commandptime extends EssentialsCommand
return;
}
IUser user = sender instanceof Player ? Player.getUser((Player)sender) : null;
IUser user = sender instanceof Player ? ess.getUser((Player)sender) : null;
if ((!users.contains(user) || users.size() > 1) && user != null && !Permissions.PTIME_OTHERS.isAuthorized(user))
{
user.sendMessage(_("pTimeOthersPermission"));
@@ -183,12 +183,12 @@ public class Commandptime extends EssentialsCommand
// If there is no selector we want the sender itself. Or all users if sender isn't a user.
if (selector == null)
{
final IUser user = sender instanceof Player ? Player.getUser((Player)sender) : null;
final IUser user = sender instanceof Player ? ess.getUser((Player)sender) : null;
if (user == null)
{
for (Player player : server.getOnlinePlayers())
{
users.add(Player.getUser(player));
users.add(ess.getUser(player));
}
}
else
@@ -203,7 +203,7 @@ public class Commandptime extends EssentialsCommand
final List<Player> matchedPlayers = server.matchPlayer(selector);
if (!matchedPlayers.isEmpty())
{
user = Player.getUser(matchedPlayers.get(0));
user = ess.getUser(matchedPlayers.get(0));
}
if (user != null)
@@ -215,7 +215,7 @@ public class Commandptime extends EssentialsCommand
{
for (Player player : server.getOnlinePlayers())
{
users.add(player.getUser(player));
users.add(ess.getUser(player));
}
}
// We failed to understand the world target...

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

@@ -26,7 +26,7 @@ public class Commandr extends EssentialsCommand
if (sender instanceof Player)
{
IUser user = Player.getUser((Player)sender);
IUser user = ess.getUser((Player)sender);
if (Permissions.MSG_COLOR.isAuthorized(user))
{
message = Util.replaceFormat(message);
@@ -56,8 +56,8 @@ public class Commandr extends EssentialsCommand
sender.sendMessage(_("msgFormat", _("me"), targetName, message));
if (target instanceof Player)
{
IUser player = player.getUser((Player)target);
if (sender instanceof Player && player.isIgnoringPlayer(player.getUser((Player)sender)))
IUser player = ess.getUser((Player)target);
if (sender instanceof Player && player.isIgnoringPlayer(ess.getUser((Player)sender)))
{
return;
}
@@ -68,7 +68,7 @@ public class Commandr extends EssentialsCommand
{
if (target instanceof Player)
{
player.getUser((Player)target).setReplyTo(sender);
ess.getUser((Player)target).setReplyTo(sender);
}
else
{

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

@@ -24,7 +24,7 @@ public class Commandrealname extends EssentialsCommand
final String whois = args[0].toLowerCase(Locale.ENGLISH);
for (Player onlinePlayer : server.getOnlinePlayers())
{
final IUser u = player.getUser(onlinePlayer);
final IUser u = ess.getUser(onlinePlayer);
if (u.isHidden())
{
continue;

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

@@ -37,7 +37,7 @@ public class Commandseen extends EssentialsCommand
catch (NoSuchFieldException e)
{
@Cleanup
IUser u = player.getUser(args[0]);
IUser u = ess.getUser(args[0]);
u.acquireReadLock();
if (u == null)
{

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

@@ -56,7 +56,7 @@ public class Commandsethome extends EssentialsCommand
if (Permissions.SETHOME_OTHERS.isAuthorized(user))
{
@Cleanup
IUser usersHome = player.getUser(ess.getServer().getPlayer(args[0]));
IUser usersHome = ess.getUser(ess.getServer().getPlayer(args[0]));
if (usersHome == null)
{
throw new Exception(_("playerNotFound"));

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

@@ -51,7 +51,7 @@ public class Commandtempban extends EssentialsCommand
for (Player onlinePlayer : server.getOnlinePlayers())
{
final IUser player = player.getUser(onlinePlayer);
final IUser player = ess.getUser(onlinePlayer);
if (Permissions.BAN_NOTIFY.isAuthorized(player))
{
onlinePlayer.sendMessage(_("playerBanned", senderName, user.getName(), banReason));

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

@@ -122,7 +122,7 @@ public class Commandtime extends EssentialsCommand
// If there is no selector we want the world the user is currently in. Or all worlds if it isn't a user.
if (selector == null)
{
final IUser user = sender instanceof Player ? player.getUser((Player)sender) : null;
final IUser user = sender instanceof Player ? ess.getUser((Player)sender) : null;
if (user == null)
{
worlds.addAll(server.getWorlds());

4
Essentials/src/net/ess3/commands/Commandtpaall.java
View File

@@ -18,7 +18,7 @@ public class Commandtpaall extends EssentialsCommand
{
if (sender instanceof Player)
{
teleportAAllPlayers(sender, player.getUser((Player)sender));
teleportAAllPlayers(sender, ess.getUser((Player)sender));
return;
}
throw new NotEnoughArgumentsException();
@@ -34,7 +34,7 @@ public class Commandtpaall extends EssentialsCommand
for (Player onlinePlayer : server.getOnlinePlayers())
{
@Cleanup
final IUser player = player.getUser(onlinePlayer);
final IUser player = ess.getUser(onlinePlayer);
player.acquireReadLock();
if (user == player)
{

4
Essentials/src/net/ess3/commands/Commandtpall.java
View File

@@ -20,7 +20,7 @@ public class Commandtpall extends EssentialsCommand
{
if (sender instanceof Player)
{
teleportAllPlayers(sender, player.getUser((Player)sender));
teleportAllPlayers(sender, ess.getUser((Player)sender));
return;
}
throw new NotEnoughArgumentsException();
@@ -35,7 +35,7 @@ public class Commandtpall extends EssentialsCommand
sender.sendMessage(_("teleportAll"));
for (Player onlinePlayer : server.getOnlinePlayers())
{
final IUser player = player.getUser(onlinePlayer);
final IUser player = ess.getUser(onlinePlayer);
if (user == player)
{
continue;

4
Essentials/src/net/ess3/commands/Commandtppos.java
View File

@@ -2,9 +2,9 @@ package net.ess3.commands;
import static net.ess3.I18n._;
import net.ess3.api.IUser;
import net.ess3.api.server.CommandSender;
import net.ess3.api.server.Location;
import net.ess3.economy.Trade;
//TODO: remove bukkit
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -45,7 +45,7 @@ public class Commandtppos extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
IUser user = player.getUser(server.getPlayer(args[0]));
IUser user = ess.getUser(server.getPlayer(args[0]));
final int x = Integer.parseInt(args[1]);
final int y = Integer.parseInt(args[2]);
final int z = Integer.parseInt(args[3]);

5
Essentials/src/net/ess3/commands/Commandwarp.java
View File

@@ -12,7 +12,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
//TODO: remove bukkit
import net.ess3.api.server.CommandSender;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -37,7 +36,7 @@ public class Commandwarp extends EssentialsCommand
IUser otherUser = null;
if (args.length == 2 && Permissions.WARP_OTHERS.isAuthorized(user))
{
otherUser = player.getUser(server.getPlayer(args[1]));
otherUser = ess.getUser(server.getPlayer(args[1]));
if (otherUser == null)
{
throw new Exception(_("playerNotFound"));
@@ -58,7 +57,7 @@ public class Commandwarp extends EssentialsCommand
warpList(sender, args);
throw new NoChargeException();
}
IUser otherUser = player.getUser(server.getPlayer(args[1]));
IUser otherUser = ess.getUser(server.getPlayer(args[1]));
if (otherUser == null)
{
throw new Exception(_("playerNotFound"));

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

@@ -53,7 +53,7 @@ public abstract class EssentialsCommand extends AbstractSuperpermsPermission imp
{
throw new NoSuchFieldException(_("playerNotFound"));
}
final IUser user = player.getUser(args[pos]);
final IUser user = ess.getUser(args[pos]);
if (user != null)
{
if (!getOffline && (!user.isOnline() || user.isHidden()))

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

@@ -102,7 +102,7 @@ public class EssentialsCommandHandler implements ICommandHandler
IUser user = null;
if (sender instanceof Player)
{
user = player.getUser((Player)sender);
user = ess.getUser((Player)sender);
LOGGER.log(Level.INFO, String.format("[PLAYER_COMMAND] %s: /%s %s ", ((Player)sender).getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)));
}