diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-12-19 10:57:44 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-12-19 10:57:44 +0000 |
| commit | 37b44a03ed58b74ba36bca25761c7711a0da7d22 (patch) | |
| tree | 299684c8b16589f49c3f27610ecd1bee5c5ef12e | |
| parent | 4a6f6cf32ac37e77253169a788cc81b64ecae3ac (diff) | |
| parent | d1b3ab05b060cc11797d4e74376d54b5aece68e3 (diff) | |
| download | Essentials-37b44a03ed58b74ba36bca25761c7711a0da7d22.tar Essentials-37b44a03ed58b74ba36bca25761c7711a0da7d22.tar.gz Essentials-37b44a03ed58b74ba36bca25761c7711a0da7d22.tar.lz Essentials-37b44a03ed58b74ba36bca25761c7711a0da7d22.tar.xz Essentials-37b44a03ed58b74ba36bca25761c7711a0da7d22.zip | |
Merge branch 'master' of github.com:essentials/Essentials
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Jails.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Jails.java b/Essentials/src/com/earth2me/essentials/Jails.java index 4c1090c5c..f8ab2d02e 100644 --- a/Essentials/src/com/earth2me/essentials/Jails.java +++ b/Essentials/src/com/earth2me/essentials/Jails.java @@ -59,7 +59,12 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett { 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 { @@ -111,7 +116,8 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett { 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); } |