summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorementalo <ementalodev@gmx.co.uk>2012-07-03 14:46:38 +0100
committerementalo <ementalodev@gmx.co.uk>2012-07-03 14:46:38 +0100
commitd78c4930c10c01f52de1f3634af69bd184c0ac2c (patch)
tree3e13abffc114d3682282fb1dca06282446b0f40e
parenta4dea20292ae09c6b49348792c8e35721f944d7e (diff)
downloadEssentials-d78c4930c10c01f52de1f3634af69bd184c0ac2c.tar
Essentials-d78c4930c10c01f52de1f3634af69bd184c0ac2c.tar.gz
Essentials-d78c4930c10c01f52de1f3634af69bd184c0ac2c.tar.lz
Essentials-d78c4930c10c01f52de1f3634af69bd184c0ac2c.tar.xz
Essentials-d78c4930c10c01f52de1f3634af69bd184c0ac2c.zip
Cleanup getHome(s)
-rw-r--r--Essentials/src/net/ess3/user/User.java14
-rw-r--r--Essentials/src/net/ess3/user/UserBase.java2
2 files changed, 3 insertions, 13 deletions
diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java
index 2341735da..615415349 100644
--- a/Essentials/src/net/ess3/user/User.java
+++ b/Essentials/src/net/ess3/user/User.java
@@ -556,13 +556,7 @@ public class User extends UserBase implements IUser
{
// Ignore
}
- }
-
- @Override
- public List<String> getHomes()
- {
- return super.getHomes();
- }
+ }
@Override
public int compareTo(final IUser t)
@@ -772,9 +766,5 @@ public class User extends UserBase implements IUser
this.setVanished(set);
}
- @Override
- public Location getHome(String name) throws Exception
- {
- return super.getHome(name);
- }
+
}
diff --git a/Essentials/src/net/ess3/user/UserBase.java b/Essentials/src/net/ess3/user/UserBase.java
index 70c7e6ed2..18bede37c 100644
--- a/Essentials/src/net/ess3/user/UserBase.java
+++ b/Essentials/src/net/ess3/user/UserBase.java
@@ -417,7 +417,7 @@ public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implem
}
try
{
- return getData().getHomes().get(Util.sanitizeFileName(name)).getBukkitLocation();
+ return getData().getHomes().get(Util.sanitizeKey(name)).getBukkitLocation();
}
catch (WorldNotLoadedException ex)
{