summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src
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
commite563405a7dcd462d6bae00189c89dd789509c8e0 (patch)
treeebed0424bf98c0a37a1a3d3527e4ca068ced7847 /EssentialsGroupManager/src
parentae2cf3d95c752b78408b58af7cce11575d210230 (diff)
downloadEssentials-e563405a7dcd462d6bae00189c89dd789509c8e0.tar
Essentials-e563405a7dcd462d6bae00189c89dd789509c8e0.tar.gz
Essentials-e563405a7dcd462d6bae00189c89dd789509c8e0.tar.lz
Essentials-e563405a7dcd462d6bae00189c89dd789509c8e0.tar.xz
Essentials-e563405a7dcd462d6bae00189c89dd789509c8e0.zip
Check for a null player object in the PlayerTeleportEvent.
Diffstat (limited to 'EssentialsGroupManager/src')
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java2
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());
}
}