From 70b0f22d34f67b53f38e5f4b83a308e34840b3a1 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 10 Apr 2011 23:35:07 +0000 Subject: [PATCH] [trunk] Home: Catch world not loaded/unknown in server. git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1171 e251c2fe-e539-e718-e476-b85c1f46cddb --- Essentials/src/com/earth2me/essentials/User.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 66a452541..c2159a17b 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -504,6 +504,9 @@ public class User extends PlayerExtension implements Comparable, IReplyTo if (vals.size() > 5 && getServer() != null) { world = getServer().getWorld((String)vals.get(5)); } + if (world == null) { + throw new Exception(); + } return new Location( world, ((Number)vals.get(0)).doubleValue(), @@ -521,6 +524,9 @@ public class User extends PlayerExtension implements Comparable, IReplyTo if (vals.size() > 5) { world = getServer().getWorld((String)vals.get(5)); } + if (world == null) { + throw new Exception(); + } return new Location(world, ((Number)vals.get(0)).doubleValue(), ((Number)vals.get(1)).doubleValue(),