minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-02 11:13:55 +02:00
Code Issues Releases Wiki Activity

Using the new methods in Essentials to getUser

Browse Source
This commit is contained in:
snowleo
2012-07-12 11:26:33 +02:00
parent 719e1a861f
commit 3060a7b259
6 changed files with 18 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Essentials/src/net/ess3/Essentials.java
View File

@@ -345,61 +345,17 @@ public class Essentials extends JavaPlugin implements IEssentials
}
@Override
public IUser getUser(final Object base)
public IUser getUser(final Player player)
{
if (base instanceof Player)
{
return getUser((Player)base);
}
if (base instanceof String)
{
final IUser user = userMap.getUser((String)base);
if (user != null && user.getBase() instanceof IOfflinePlayer)
{
((IOfflinePlayer)user.getBase()).setName((String)base);
}
return user;
}
return null;
return userMap.getUser(player);
}
private <T extends Player> IUser getUser(final T base)
@Override
public IUser getUser(final String playerName)
{
if (base == null)
{
return null;
}
if (base instanceof IUser)
{
return (IUser)base;
}
IUser user = userMap.getUser(base.getName());
if (user == null)
{
user = new User(base, this);
}
else
{
//todo - fix this
user.update(base);
}
return user;
return userMap.getUser(playerName);
}
/*@Override
public IUser getUser(final Player player)
{
return userMap.getUser(player);
}
@Override
public IUser getUser(final String playerName)
{
return userMap.getUser(playerName);
}
*/
@Override
public World getWorld(final String name)
{

3
Essentials/src/net/ess3/Jails.java
View File

@@ -14,6 +14,7 @@ import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
@@ -240,7 +241,7 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
final Entity damager = event.getDamager();
if (damager.getType() == EntityType.PLAYER)
{
final IUser user = ess.getUser(damager);
final IUser user = ess.getUser((Player)damager);
if (user != null && user.getData().isJailed())
{
event.setCancelled(true);

6
Essentials/src/net/ess3/api/IEssentials.java
View File

@@ -7,6 +7,7 @@ import net.ess3.metrics.Metrics;
import java.util.List;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
@@ -14,7 +15,10 @@ public interface IEssentials extends Plugin
{
void addReloadListener(IReload listener);
IUser getUser(final Object base);
//IUser getUser(final Object base);
IUser getUser(final Player player);
IUser getUser(final String playerName);
int broadcastMessage(IUser sender, String message);

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

@@ -86,7 +86,7 @@ public class Commandmsg extends EssentialsCommand
{
sender.sendMessage(_("msgFormat", translatedMe, matchedPlayer.getDisplayName(), message));
final IUser matchedUser = ess.getUser(matchedPlayer);
if (sender instanceof Player && (matchedUser.isIgnoringPlayer(ess.getUser(sender)) || matchedUser.isHidden()))
if (sender instanceof Player && (matchedUser.isIgnoringPlayer(ess.getUser((Player)sender)) || matchedUser.isHidden()))
{
continue;
}

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

@@ -57,7 +57,7 @@ public class Commandr extends EssentialsCommand
if (target instanceof Player)
{
IUser player = ess.getUser((Player)target);
if (sender instanceof Player && player.isIgnoringPlayer(ess.getUser(sender)))
if (sender instanceof Player && player.isIgnoringPlayer(ess.getUser((Player)sender)))
{
return;
}

9
Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
View File

@@ -22,7 +22,6 @@ import lombok.Cleanup;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@@ -463,11 +462,11 @@ public class EssentialsPlayerListener implements Listener
{
if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
{
final IUser user = ess.getUser(event.getWhoClicked());
final IUser user = ess.getUser((Player)event.getWhoClicked());
final InventoryHolder invHolder = event.getView().getTopInventory().getHolder();
if (invHolder != null && invHolder instanceof HumanEntity)
if (invHolder != null && invHolder instanceof Player)
{
final IUser invOwner = ess.getUser((HumanEntity)invHolder);
final IUser invOwner = ess.getUser((Player)invHolder);
if (user.isInvSee() && (!Permissions.INVSEE_MODIFY.isAuthorized(user)
|| Permissions.INVSEE_PREVENT_MODIFY.isAuthorized(invOwner)
|| !invOwner.isOnline()))
@@ -483,7 +482,7 @@ public class EssentialsPlayerListener implements Listener
{
if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
{
final IUser user = ess.getUser(event.getPlayer());
final IUser user = ess.getUser((Player)event.getPlayer());
user.setInvSee(false);
}
}