From 6e9e74a1455acd6f3681c48cfff8793ef677d447 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Sat, 24 Sep 2011 02:47:01 +0100
Subject: Fix for null in PLAYER_TELEPORT for bukkit perms.

---
 .../org/anjocaido/groupmanager/permissions/BukkitPermissions.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index ec6fcebca..cf3edafc0 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -195,11 +195,9 @@ public class BukkitPermissions {
 
         @Override
         public void onPlayerPortal(PlayerPortalEvent event) { // will portal into another world
-            if(event.getPlayer().getWorld().equals(event.getTo().getWorld())){ // only if world actually changed
-                return;
+            if(!event.getFrom().getWorld().equals(event.getTo().getWorld())){ // only if world actually changed
+            	updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
             }
-            
-            updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
         }
 
         @Override
-- 
cgit v1.2.3