summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-04-10 23:35:07 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-04-10 23:35:07 +0000
commitd23e7a2821912767368579d020a5f98280397ea1 (patch)
tree6bc0a80ed8df53ff1338bd73c32f5f7689942572
parent471e20473bcc941998ef0319a9eab771e8330a97 (diff)
downloadEssentials-d23e7a2821912767368579d020a5f98280397ea1.tar
Essentials-d23e7a2821912767368579d020a5f98280397ea1.tar.gz
Essentials-d23e7a2821912767368579d020a5f98280397ea1.tar.lz
Essentials-d23e7a2821912767368579d020a5f98280397ea1.tar.xz
Essentials-d23e7a2821912767368579d020a5f98280397ea1.zip
[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
-rw-r--r--Essentials/src/com/earth2me/essentials/User.java6
1 files changed, 6 insertions, 0 deletions
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<User>, 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<User>, 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(),