diff options
author | ElgarL <ElgarL@palmergames.com> | 2011-09-24 02:47:01 +0100 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2011-09-24 02:47:01 +0100 |
commit | 6e9e74a1455acd6f3681c48cfff8793ef677d447 (patch) | |
tree | acd2449ac7265d1e2cdbb1dbe552ade95e0c98d7 | |
parent | cb26734c34cf64892459eacd447bb845f3de1896 (diff) | |
download | Essentials-6e9e74a1455acd6f3681c48cfff8793ef677d447.tar Essentials-6e9e74a1455acd6f3681c48cfff8793ef677d447.tar.gz Essentials-6e9e74a1455acd6f3681c48cfff8793ef677d447.tar.lz Essentials-6e9e74a1455acd6f3681c48cfff8793ef677d447.tar.xz Essentials-6e9e74a1455acd6f3681c48cfff8793ef677d447.zip |
Fix for null in PLAYER_TELEPORT for bukkit perms.
-rw-r--r-- | EssentialsGroupManager/src/Changelog.txt | 3 | ||||
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 6015b470e..388fc938a 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -13,4 +13,5 @@ v 1.1: - Push updates to superperms for all valid GM commands.
- All GroupManager commands issued by players are now echoed in the console.
- Reverted WorldHolder static change to maintain backward plugin compatibility.
- - Update to handle 'getDescription().getPermissions(') returning a list (CB 1172).
\ No newline at end of file + - Update to handle 'getDescription().getPermissions(') returning a list (CB 1172).
+ - Fix for null in PLAYER_TELEPORT for bukkit perms.
\ 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 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
|