diff options
| author | snowleo <schneeleo@gmail.com> | 2011-12-07 10:37:34 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-12-07 10:37:34 +0100 |
| commit | 261ebebb62e019d42209d2223db2f444f856e165 (patch) | |
| tree | 3f470613623032dc88cb22a4f68e3d92c8fc8097 /EssentialsSpawn/src/com | |
| parent | 52961b40a69bb6064549d128cc9a9c3f66a6a7f3 (diff) | |
| download | Essentials-261ebebb62e019d42209d2223db2f444f856e165.tar Essentials-261ebebb62e019d42209d2223db2f444f856e165.tar.gz Essentials-261ebebb62e019d42209d2223db2f444f856e165.tar.lz Essentials-261ebebb62e019d42209d2223db2f444f856e165.tar.xz Essentials-261ebebb62e019d42209d2223db2f444f856e165.zip | |
Null check in new player teleport, fixes #1212
Diffstat (limited to 'EssentialsSpawn/src/com')
| -rw-r--r-- | EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 8c3678a92..530a00faa 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -85,7 +85,11 @@ public class EssentialsSpawnPlayerListener extends PlayerListener { try { - user.getTeleport().now(spawns.getSpawn(ess.getSettings().getNewbieSpawn()), false, TeleportCause.PLUGIN); + Location spawn = spawns.getSpawn(ess.getSettings().getNewbieSpawn()); + if (spawn != null) + { + user.getTeleport().now(spawn, false, TeleportCause.PLUGIN); + } } catch (Exception ex) { |