From e563405a7dcd462d6bae00189c89dd789509c8e0 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Wed, 25 Jan 2012 22:35:24 +0000
Subject: Check for a null player object in the PlayerTeleportEvent.

---
 .../src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 481779c3c..3ab2dbbeb 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -397,7 +397,7 @@ public class BukkitPermissions {
 
 		@EventHandler(priority = EventPriority.LOWEST)
 		public void onPlayerTeleport(PlayerTeleportEvent event) { // can be teleported into another world
-			if ((event.getTo() != null) && (!event.getFrom().getWorld().equals(event.getTo().getWorld()))) { // only if world actually changed
+			if ((event.getTo() != null) && (event.getPlayer() != null) && (!event.getFrom().getWorld().equals(event.getTo().getWorld()))) { // only if world actually changed
 				updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
 			}
 		}
-- 
cgit v1.2.3