From ef49d92c49a3f83a214a9a9ce970108a4611e1b4 Mon Sep 17 00:00:00 2001
From: snowleo <schneeleo@gmail.com>
Date: Wed, 7 Dec 2011 10:37:34 +0100
Subject: Null check in new player teleport, fixes #1212

---
 .../earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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)
 			{
-- 
cgit v1.2.3