TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-07-02 18:53:43 +00:00
Code Issues Projects Releases Wiki Activity

[trunk] fix /home playername. Look out for any case sesitive weirdness

Browse source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1288 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
ementalo 2011-04-28 22:52:08 +00:00
parent db191e3115
commit 2b915e72fa
2 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Essentials/src/com/earth2me/essentials/User.java
View file

@ -498,9 +498,24 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo
public Location getHome() throws Exception
{
if (data.containsKey("home"))
return getHome(null);
}
public Location getHome(String playerName) throws Exception
{
Map<String, Object> userData = new HashMap<String, Object>();
if (playerName == null)
{
List<Object> vals = (List<Object>)data.get("home");
userData = data;
}
else
{
userData = Essentials.getData(playerName);
}
if (userData.containsKey("home"))
{
List<Object> vals = (List<Object>)userData.get("home");
World world = getServer() == null ? null : getServer().getWorlds().get(0);
if (vals.size() > 5 && getServer() != null)
{
@ -521,7 +536,16 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo
try
{
Map<String, Object> gdata = Essentials.getData(this);
Map<String, Object> gdata = null;
if (playerName != null)
{
gdata = Essentials.getData(playerName);
}
else
{
gdata = Essentials.getData(this);
}
List<Object> vals = (List<Object>)gdata.get("home");
World world = getServer().getWorlds().get(0);
if (vals.size() > 5)
@ -546,14 +570,25 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo
}
public void teleportToHome(final String chargeFor)
{
teleportToHome(chargeFor, null);
}
public void teleportToHome(final String chargeFor, String otherPlayer)
{
final long delay = Essentials.getSettings().getTeleportDelay();
Location loc = null;
try
{
// check this first in case user hasn't set a home yet
loc = getHome();
{// check this first in case user hasn't set a home yet
if (otherPlayer == null)
{
loc = getHome();
}
else
{
loc = getHome(otherPlayer);
}
}
catch (Throwable ex)
{
@ -787,7 +822,9 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo
if (command == null || command.trim().isEmpty())
{
tools.remove(Integer.valueOf(stack.getTypeId()));
} else {
}
else
{
tools.put(Integer.valueOf(stack.getTypeId()), command.trim());
}
data.put("powertools", tools);

2
Essentials/src/com/earth2me/essentials/commands/Commandhome.java
View file

@ -18,7 +18,7 @@ public class Commandhome extends EssentialsCommand
user.teleportCooldown();
if(args.length > 0 && user.isAuthorized("essentials.home.others"))
{
user.teleportToHome(args[0]);
user.teleportToHome(this.getName(), args[0]);
return;
}
user.teleportToHome(this.getName());