ReadLock for realname

Remove unneeded overrides
Redo Khobbits messages_de changes

3 files changed, 6 insertions, 821 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java b/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java
index 68478467b..6b4381d7b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java
@@ -2,8 +2,10 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
 import java.util.Locale;
+import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -17,6 +19,7 @@ public class Commandrealname extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
+		@Cleanup final ISettings settings = ess.getSettings();
 		final String whois = args[0].toLowerCase(Locale.ENGLISH);
 		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
@@ -26,8 +29,9 @@ public class Commandrealname extends EssentialsCommand
 				continue;
 			}
 			final String displayName = Util.stripColor(u.getDisplayName()).toLowerCase(Locale.ENGLISH);
+			settings.acquireReadLock();
 			if (!whois.equals(displayName)
-				&& !displayName.equals(Util.stripColor(ess.getSettings().getData().getChat().getNicknamePrefix()) + whois)
+				&& !displayName.equals(Util.stripColor(settings.getData().getChat().getNicknamePrefix()) + whois)
 				&& !whois.equalsIgnoreCase(u.getName()))
 			{
 				continue;
diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/com/earth2me/essentials/user/User.java
index 0ac458a7f..e42e5396a 100644
--- a/Essentials/src/com/earth2me/essentials/user/User.java
+++ b/Essentials/src/com/earth2me/essentials/user/User.java
@@ -702,824 +702,5 @@ public class User extends UserBase implements IUser
 			spew = true;
 		}
 		return spew;
-	}
-
-	@Override
-	public void setDisplayName(String string)
-	{
-		base.setDisplayName(string);
-	}
-
-	@Override
-	public String getPlayerListName()
-	{
-		return base.getPlayerListName();
-	}
-
-	@Override
-	public void setPlayerListName(String string)
-	{
-		base.setPlayerListName(string);
-	}
-
-	@Override
-	public void setCompassTarget(Location lctn)
-	{
-		base.setCompassTarget(lctn);
-	}
-
-	@Override
-	public Location getCompassTarget()
-	{
-		return base.getCompassTarget();
-	}
-
-	@Override
-	public InetSocketAddress getAddress()
-	{
-		return base.getAddress();
-	}
-
-	@Override
-	public void sendRawMessage(String string)
-	{
-		base.sendRawMessage(string);
-	}
-
-	@Override
-	public void kickPlayer(String string)
-	{
-		base.kickPlayer(string);
-	}
-
-	@Override
-	public void chat(String string)
-	{
-		base.chat(string);
-	}
-
-	@Override
-	public boolean performCommand(String string)
-	{
-		return base.performCommand(string);
-	}
-
-	@Override
-	public boolean isSneaking()
-	{
-		return base.isSneaking();
-	}
-
-	@Override
-	public void setSneaking(boolean bln)
-	{
-		base.setSneaking(bln);
-	}
-
-	@Override
-	public boolean isSprinting()
-	{
-		return base.isSprinting();
-	}
-
-	@Override
-	public void setSprinting(boolean bln)
-	{
-		base.setSprinting(bln);
-	}
-
-	@Override
-	public void saveData()
-	{
-		base.saveData();
-	}
-
-	@Override
-	public void loadData()
-	{
-		base.loadData();
-	}
-
-	@Override
-	public void setSleepingIgnored(boolean bln)
-	{
-		base.setSleepingIgnored(bln);
-	}
-
-	@Override
-	public boolean isSleepingIgnored()
-	{
-		return base.isSleepingIgnored();
-	}
-
-	@Override
-	public void playNote(Location lctn, byte b, byte b1)
-	{
-		base.playNote(lctn, b, b1);
-	}
-
-	@Override
-	public void playNote(Location lctn, Instrument i, Note note)
-	{
-		base.playNote(lctn, i, note);
-	}
-
-	@Override
-	public void playEffect(Location lctn, Effect effect, int i)
-	{
-		base.playEffect(lctn, effect, i);
-	}
-
-	@Override
-	public void sendBlockChange(Location lctn, Material mtrl, byte b)
-	{
-		base.sendBlockChange(lctn, mtrl, b);
-	}
-
-	@Override
-	public boolean sendChunkChange(Location lctn, int i, int i1, int i2, byte[] bytes)
-	{
-		return base.sendChunkChange(lctn, i, i1, i2, bytes);
-	}
-
-	@Override
-	public void sendBlockChange(Location lctn, int i, byte b)
-	{
-		base.sendBlockChange(lctn, i, b);
-	}
-
-	@Override
-	public void sendMap(MapView mv)
-	{
-		base.sendMap(mv);
-	}
-
-	@Override
-	public void updateInventory()
-	{
-		base.updateInventory();
-	}
-
-	@Override
-	public void awardAchievement(Achievement a)
-	{
-		base.awardAchievement(a);
-	}
-
-	@Override
-	public void incrementStatistic(Statistic ststc)
-	{
-		base.incrementStatistic(ststc);
-	}
-
-	@Override
-	public void incrementStatistic(Statistic ststc, int i)
-	{
-		base.incrementStatistic(ststc, i);
-	}
-
-	@Override
-	public void incrementStatistic(Statistic ststc, Material mtrl)
-	{
-		base.incrementStatistic(ststc, mtrl);
-	}
-
-	@Override
-	public void incrementStatistic(Statistic ststc, Material mtrl, int i)
-	{
-		base.incrementStatistic(ststc, mtrl, i);
-	}
-
-	@Override
-	public void setPlayerTime(long l, boolean bln)
-	{
-		base.setPlayerTime(l, bln);
-	}
-
-	@Override
-	public long getPlayerTime()
-	{
-		return base.getPlayerTime();
-	}
-
-	@Override
-	public long getPlayerTimeOffset()
-	{
-		return base.getPlayerTimeOffset();
-	}
-
-	@Override
-	public boolean isPlayerTimeRelative()
-	{
-		return base.isPlayerTimeRelative();
-	}
-
-	@Override
-	public void resetPlayerTime()
-	{
-		base.resetPlayerTime();
-	}
-
-	@Override
-	public void giveExp(int i)
-	{
-		base.giveExp(i);
-	}
-
-	@Override
-	public float getExp()
-	{
-		return base.getExp();
-	}
-
-	@Override
-	public void setExp(float f)
-	{
-		base.setExp(f);
-	}
-
-	@Deprecated
-	@Override
-	public int getExperience()
-	{
-		return base.getExperience();
-	}
-
-	@Deprecated
-	@Override
-	public void setExperience(int i)
-	{
-		base.setExperience(i);
-	}
-
-	@Override
-	public int getLevel()
-	{
-		return base.getLevel();
-	}
-
-	@Override
-	public void setLevel(int i)
-	{
-		base.setLevel(i);
-	}
-
-	@Override
-	public int getTotalExperience()
-	{
-		return base.getTotalExperience();
-	}
-
-	@Override
-	public void setTotalExperience(int i)
-	{
-		base.setTotalExperience(i);
-	}
-
-	@Override
-	public float getExhaustion()
-	{
-		return base.getExhaustion();
-	}
-
-	@Override
-	public void setExhaustion(float f)
-	{
-		base.setExhaustion(f);
-	}
-
-	@Override
-	public float getSaturation()
-	{
-		return base.getSaturation();
-	}
-
-	@Override
-	public void setSaturation(float f)
-	{
-		base.setSaturation(f);
-	}
-
-	@Override
-	public int getFoodLevel()
-	{
-		return base.getFoodLevel();
-	}
-
-	@Override
-	public void setFoodLevel(int i)
-	{
-		base.setFoodLevel(i);
-	}
-
-	@Override
-	public PlayerInventory getInventory()
-	{
-		return base.getInventory();
-	}
-
-	@Override
-	public ItemStack getItemInHand()
-	{
-		return base.getItemInHand();
-	}
-
-	@Override
-	public void setItemInHand(ItemStack is)
-	{
-		base.setItemInHand(is);
-	}
-
-	@Override
-	public boolean isSleeping()
-	{
-		return base.isSleeping();
-	}
-
-	@Override
-	public int getSleepTicks()
-	{
-		return base.getSleepTicks();
-	}
-
-	@Override
-	public GameMode getGameMode()
-	{
-		return base.getGameMode();
-	}
-
-	@Override
-	public void setGameMode(GameMode gm)
-	{
-		base.setGameMode(gm);
-	}
-
-	@Override
-	public int getHealth()
-	{
-		return base.getHealth();
-	}
-
-	@Override
-	public void setHealth(int i)
-	{
-		base.setHealth(i);
-	}
-
-	@Override
-	public int getMaxHealth()
-	{
-		return base.getMaxHealth();
-	}
-
-	@Override
-	public double getEyeHeight()
-	{
-		return base.getEyeHeight();
-	}
-
-	@Override
-	public double getEyeHeight(boolean bln)
-	{
-		return base.getEyeHeight(bln);
-	}
-
-	@Override
-	public Location getEyeLocation()
-	{
-		return base.getEyeLocation();
-	}
-
-	@Override
-	public List<Block> getLineOfSight(HashSet<Byte> hs, int i)
-	{
-		return base.getLineOfSight(hs, i);
-	}
-
-	@Override
-	public Block getTargetBlock(HashSet<Byte> hs, int i)
-	{
-		return base.getTargetBlock(hs, i);
-	}
-
-	@Override
-	public List<Block> getLastTwoTargetBlocks(HashSet<Byte> hs, int i)
-	{
-		return base.getLastTwoTargetBlocks(hs, i);
-	}
-
-	@Override
-	public Egg throwEgg()
-	{
-		return base.throwEgg();
-	}
-
-	@Override
-	public Snowball throwSnowball()
-	{
-		return base.throwSnowball();
-	}
-
-	@Override
-	public Arrow shootArrow()
-	{
-		return base.shootArrow();
-	}
-
-	@Override
-	public boolean isInsideVehicle()
-	{
-		return base.isInsideVehicle();
-	}
-
-	@Override
-	public boolean leaveVehicle()
-	{
-		return base.leaveVehicle();
-	}
-
-	@Override
-	public Vehicle getVehicle()
-	{
-		return base.getVehicle();
-	}
-
-	@Override
-	public int getRemainingAir()
-	{
-		return base.getRemainingAir();
-	}
-
-	@Override
-	public void setRemainingAir(int i)
-	{
-		base.setRemainingAir(i);
-	}
-
-	@Override
-	public int getMaximumAir()
-	{
-		return base.getMaximumAir();
-	}
-
-	@Override
-	public void setMaximumAir(int i)
-	{
-		base.setMaximumAir(i);
-	}
-
-	@Override
-	public void damage(int i)
-	{
-		base.damage(i);
-	}
-
-	@Override
-	public void damage(int i, Entity entity)
-	{
-		base.damage(i, entity);
-	}
-
-	@Override
-	public int getMaximumNoDamageTicks()
-	{
-		return base.getMaximumNoDamageTicks();
-	}
-
-	@Override
-	public void setMaximumNoDamageTicks(int i)
-	{
-		base.setMaximumNoDamageTicks(i);
-	}
-
-	@Override
-	public int getLastDamage()
-	{
-		return base.getLastDamage();
-	}
-
-	@Override
-	public void setLastDamage(int i)
-	{
-		base.setLastDamage(i);
-	}
-
-	@Override
-	public int getNoDamageTicks()
-	{
-		return base.getNoDamageTicks();
-	}
-
-	@Override
-	public void setNoDamageTicks(int i)
-	{
-		base.setNoDamageTicks(i);
-	}
-
-	@Override
-	public Player getKiller()
-	{
-	    return base.getKiller();
-	}
-
-	@Override
-	public Location getLocation()
-	{
-		return base.getLocation();
-	}
-
-	@Override
-	public void setVelocity(Vector vector)
-	{
-		base.setVelocity(vector);
-	}
-
-	@Override
-	public Vector getVelocity()
-	{
-		return base.getVelocity();
-				
-	}
-
-	@Override
-	public World getWorld()
-	{
-		return base.getWorld();
-	}
-
-	@Override
-	public boolean teleport(Location lctn)
-	{
-		return base.teleport(lctn);				
-	}
-
-	@Override
-	public boolean teleport(Location lctn, TeleportCause tc)
-	{
-		return base.teleport(this, tc);
-	}
-
-	@Override
-	public boolean teleport(Entity entity)
-	{
-		return base.teleport(entity);
-	}
-
-	@Override
-	public boolean teleport(Entity entity, TeleportCause tc)
-	{
-		return base.teleport(entity, tc);
-	}
-
-	@Override
-	public List<Entity> getNearbyEntities(double d, double d1, double d2)
-	{
-		return base.getNearbyEntities(d, d1, d2);
-	}
-
-	@Override
-	public int getEntityId()
-	{
-		return base.getEntityId();
-	}
-
-	@Override
-	public int getFireTicks()
-	{
-		return base.getFireTicks();
-	}
-
-	@Override
-	public int getMaxFireTicks()
-	{
-		return base.getMaxFireTicks();
-	}
-
-	@Override
-	public void setFireTicks(int i)
-	{
-		base.setFireTicks(i);
-	}
-
-	@Override
-	public void remove()
-	{
-		base.remove();
-	}
-
-	@Override
-	public boolean isDead()
-	{
-		return base.isDead();
-	}
-
-	@Override
-	public Server getServer()
-	{
-		return base.getServer();
-	}
-
-	@Override
-	public Entity getPassenger()
-	{
-		return base.getPassenger();
-	}
-
-	@Override
-	public boolean setPassenger(Entity entity)
-	{
-		return base.setPassenger(entity);
-	}
-
-	@Override
-	public boolean isEmpty()
-	{
-		return base.isEmpty();
-	}
-
-	@Override
-	public boolean eject()
-	{
-		return base.eject();
-	}
-
-	@Override
-	public float getFallDistance()
-	{
-		return base.getFallDistance();
-	}
-
-	@Override
-	public void setFallDistance(float f)
-	{
-		base.setFallDistance(f);
-	}
-
-	@Override
-	public void setLastDamageCause(EntityDamageEvent ede)
-	{
-		base.setLastDamageCause(ede);
-	}
-
-	@Override
-	public EntityDamageEvent getLastDamageCause()
-	{
-		return base.getLastDamageCause();
-	}
-
-	@Override
-	public UUID getUniqueId()
-	{
-		return base.getUniqueId();
-	}
-
-	@Override
-	public int getTicksLived()
-	{
-		return base.getTicksLived();
-	}
-
-	@Override
-	public void setTicksLived(int i)
-	{
-		base.setTicksLived(i);
-	}
-
-	@Override
-	public boolean isPermissionSet(String string)
-	{
-		return base.isPermissionSet(string);
-	}
-
-	@Override
-	public boolean isPermissionSet(Permission prmsn)
-	{
-		return base.isPermissionSet(prmsn);
-	}
-
-	@Override
-	public boolean hasPermission(String string)
-	{
-		return base.hasPermission(string);
-	}
-
-	@Override
-	public boolean hasPermission(Permission prmsn)
-	{
-		return base.hasPermission(prmsn);
-	}
-
-	@Override
-	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln)
-	{
-		return base.addAttachment(plugin, string, bln);
-	}
-
-	@Override
-	public PermissionAttachment addAttachment(Plugin plugin)
-	{
-		return base.addAttachment(plugin);
-	}
-
-	@Override
-	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln, int i)
-	{
-		return base.addAttachment(plugin, string, bln, i);
-	}
-
-	@Override
-	public PermissionAttachment addAttachment(Plugin plugin, int i)
-	{
-		return base.addAttachment(plugin, i);
-	}
-
-	@Override
-	public void removeAttachment(PermissionAttachment pa)
-	{
-		base.removeAttachment(pa);
-	}
-
-	@Override
-	public void recalculatePermissions()
-	{
-		base.recalculatePermissions();
-	}
-
-	@Override
-	public Set<PermissionAttachmentInfo> getEffectivePermissions()
-	{
-		return base.getEffectivePermissions();
-	}
-
-	@Override
-	public boolean isOp()
-	{
-		return base.isOp();
-	}
-
-	@Override
-	public void setOp(boolean bln)
-	{
-		base.setOp(bln);
-	}
-
-	@Override
-	public void sendMessage(String string)
-	{
-		base.sendMessage(string);
-	}
-
-	@Override
-	public boolean isOnline()
-	{
-		return base.isOnline();
-	}
-
-	@Override
-	public boolean isBanned()
-	{
-		return base.isBanned();
-	}
-
-	@Override
-	public boolean isWhitelisted()
-	{
-		return base.isWhitelisted();
-	}
-
-	@Override
-	public void setWhitelisted(boolean bln)
-	{
-		base.setWhitelisted(bln);
-	}
-
-	@Override
-	public Player getPlayer()
-	{
-		return base.getPlayer();
-	}
-
-	@Override
-	public long getFirstPlayed()
-	{
-		return base.getFirstPlayed();
-	}
-
-	@Override
-	public long getLastPlayed()
-	{
-		return base.getLastPlayed();
-	}
-
-	@Override
-	public boolean hasPlayedBefore()
-	{
-		return base.hasPlayedBefore();
-	}
-
-	@Override
-	public Map<String, Object> serialize()
-	{
-		return base.serialize();
 	}	
 }
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 976ce8436..3b4441273 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -123,6 +123,7 @@ infoFileDoesNotExist=Datei info.txt existiert nicht. Erzeuge eine neue Datei.
 infoPages=Seite \u00a7c{0}\u00a7f von \u00a7c{1}\u00a7f:
 infoUnknownChapter=Unbekanntes Kapitel:
 invBigger=Das andere Inventar ist gr\u00f6sser als deins.
+InvFull=\u00a7cYour inventory was full, dropping items on the floor
 invRestored=Dein Inventar wurde wieder hergestellt.
 invSee=Du siehst das Inventar von {0}.
 invSeeHelp=Benutze /invsee um dein Inventar wiederherzustellen.
@@ -159,7 +160,6 @@ kitError2=\u00a7cDiese Ausr\u00fcstung existiert nicht oder ist ung\u00fcltig.
 kitError=\u00a7cEs gibt keine g\u00fcltigen Ausr\u00fcstungen.
 kitErrorHelp=\u00a7cEventuell fehlt bei einem Gegenstand die Menge?
 kitGive=\u00a77Gebe Ausr\u00fcstung {0}.
-kitInvFull=\u00a7cDein Inventar ist voll, lege Ausr\u00fcstung auf den Boden
 kitTimed=\u00a7cDu kannst diese Ausr\u00fcstung nicht innerhalb von {0} anfordern.
 kits=\u00a77Ausr\u00fcstungen: {0}
 lightningSmited=\u00a77Du wurdest gepeinigt.