summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2012-01-25 22:35:24 +0000
committerElgarL <ElgarL@palmergames.com>2012-01-25 22:35:24 +0000
commitd6d4afc3f58e4f5e954351088bf43e0e1989312f (patch)
treef91a3aa5454d8efba6db4ba11d4ffb2b9c147afe /EssentialsGroupManager/src/org/anjocaido
parent8a5eba9664c8ba381d66d3970d4c06be187072e1 (diff)
downloadEssentials-d6d4afc3f58e4f5e954351088bf43e0e1989312f.tar
Essentials-d6d4afc3f58e4f5e954351088bf43e0e1989312f.tar.gz
Essentials-d6d4afc3f58e4f5e954351088bf43e0e1989312f.tar.lz
Essentials-d6d4afc3f58e4f5e954351088bf43e0e1989312f.tar.xz
Essentials-d6d4afc3f58e4f5e954351088bf43e0e1989312f.zip
Check for a null player object in the PlayerTeleportEvent.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java2
1 files changed, 1 insertions, 1 deletions
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());
}
}