summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2011-10-02 18:00:42 +0100
committerElgarL <ElgarL@palmergames.com>2011-10-02 18:00:42 +0100
commit49e2c38289f4ca2eaa09f4f469376b45772ca8c0 (patch)
treed07fa6d00ec33e08b8131d343f9818f479eae386 /EssentialsGroupManager/src/org
parent3030093907930543521d27e6f8e814251bc08b59 (diff)
downloadEssentials-49e2c38289f4ca2eaa09f4f469376b45772ca8c0.tar
Essentials-49e2c38289f4ca2eaa09f4f469376b45772ca8c0.tar.gz
Essentials-49e2c38289f4ca2eaa09f4f469376b45772ca8c0.tar.lz
Essentials-49e2c38289f4ca2eaa09f4f469376b45772ca8c0.tar.xz
Essentials-49e2c38289f4ca2eaa09f4f469376b45772ca8c0.zip
Fix for Bukkit passing a null To location on a player Portaling
Diffstat (limited to 'EssentialsGroupManager/src/org')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 5d153738e..19d90854b 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -198,7 +198,7 @@ public class BukkitPermissions {
@Override
public void onPlayerPortal(PlayerPortalEvent event) { // will portal into another world
- if(!event.getFrom().getWorld().equals(event.getTo().getWorld())){ // only if world actually changed
+ if(event.getTo() != null && !event.getFrom().getWorld().equals(event.getTo().getWorld())){ // only if world actually changed
updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
}
}
@@ -210,7 +210,7 @@ public class BukkitPermissions {
@Override
public void onPlayerTeleport(PlayerTeleportEvent event) { // can be teleported into another world
- if (!event.getFrom().getWorld().equals(event.getTo().getWorld())) { // only if world actually changed
+ if (event.getTo() != null && !event.getFrom().getWorld().equals(event.getTo().getWorld())) { // only if world actually changed
updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
}
}