Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-23 09:37:50 +01:00
Code Issues Projects Releases Wiki Activity

More null checks for Jails

Browse Source
This commit is contained in:
snowleo 2011-12-19 11:53:34 +01:00
parent fec3b61039
commit 8761feb93f
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);
} }