1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-12 17:45:08 +02:00

replace user.isHidden() with player.canSee()

This commit is contained in:
snowleo
2012-10-14 00:35:24 +02:00
parent eca8b54ef5
commit 9ca4f53c1a
62 changed files with 341 additions and 287 deletions

View File

@@ -45,8 +45,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerJoin(final PlayerJoinEvent event)
{
final IUser u = ess.getUserMap().getUser(event.getPlayer());
if (Permissions.GEOIP_HIDE.isAuthorized(u))
if (Permissions.GEOIP_HIDE.isAuthorized(event.getPlayer()))
{
return;
}
@@ -81,17 +80,21 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload
}
if (config.getData().isShowOnWhois())
{
final IUser u = ess.getUserMap().getUser(event.getPlayer());
u.getData().setGeolocation(builder.toString());
u.queueSave();
}
if (config.getData().isShowOnLogin() && !u.isHidden())
if (config.getData().isShowOnLogin())
{
for (Player player : event.getPlayer().getServer().getOnlinePlayers())
{
final IUser user = ess.getUserMap().getUser(player);
if (Permissions.GEOIP_SHOW.isAuthorized(user))
if (!player.canSee(event.getPlayer()))
{
user.sendMessage(_("geoipJoinFormat", user.getPlayer().getDisplayName(), builder.toString()));
continue;
}
if (Permissions.GEOIP_SHOW.isAuthorized(player))
{
player.sendMessage(_("geoipJoinFormat", player.getDisplayName(), builder.toString()));
}
}
}