From e563405a7dcd462d6bae00189c89dd789509c8e0 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Wed, 25 Jan 2012 22:35:24 +0000 Subject: [PATCH] Check for a null player object in the PlayerTeleportEvent. --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../anjocaido/groupmanager/permissions/BukkitPermissions.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index c0746cbbd..ec4873184 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -119,4 +119,5 @@ v 1.9: - '/manuaddsub' now correctly reports if it was able to add the sub group. - Allow negation to the * permission node when populating superperms. - Fix trying to modify an unmodifiable collection breaking superperms. - - Fixed subgroups (I broke earlier). \ No newline at end of file + - Fixed subgroups (I broke earlier). + - Check for a null player object in the PlayerTeleportEvent. \ No newline at end of file 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()); } }