summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido/groupmanager
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
commit679ae9756aa517c609480fd1c81b0d8f7257be08 (patch)
tree74985deebaff79548f0a3c9db5695f95161763d7 /EssentialsGroupManager/src/org/anjocaido/groupmanager
parente5c02b34817f8ad263d365edc2818454a0966065 (diff)
downloadEssentials-679ae9756aa517c609480fd1c81b0d8f7257be08.tar
Essentials-679ae9756aa517c609480fd1c81b0d8f7257be08.tar.gz
Essentials-679ae9756aa517c609480fd1c81b0d8f7257be08.tar.lz
Essentials-679ae9756aa517c609480fd1c81b0d8f7257be08.tar.xz
Essentials-679ae9756aa517c609480fd1c81b0d8f7257be08.zip
Fix for Bukkit passing a null To location on a player Portaling
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager')
-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());
}
}