TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-15 05:33:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:essentials/Essentials

Browse source
This commit is contained in:
KHobbits 2011-12-19 10:57:44 +00:00
commit 5a092f0e99
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Essentials/src/com/earth2me/essentials/Jails.java
View file

@ -59,7 +59,12 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
{ {
throw new Exception(_("jailNotExist")); throw new Exception(_("jailNotExist"));
} }
return getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH)); Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH));
if (loc == null || loc.getWorld() == null)
{
throw new Exception(_("jailNotExist"));
}
return loc;
} }
finally finally
{ {
@ -111,7 +116,8 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
{ {
if (!(user.getBase() instanceof OfflinePlayer)) if (!(user.getBase() instanceof OfflinePlayer))
{ {
user.getTeleport().now(getJail(jail), false, TeleportCause.COMMAND); Location loc = getJail(jail);
user.getTeleport().now(loc, false, TeleportCause.COMMAND);
} }
user.setJail(jail); user.setJail(jail);
} }