diff options
| author | ElgarL <ElgarL@palmergames.com> | 2012-01-21 19:09:08 +0000 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2012-01-21 19:09:08 +0000 |
| commit | e638ef4f99d1d10015c173b9cecd93c02551db8e (patch) | |
| tree | 12b097850db1fbd50a76022441e3ddabf18757de /EssentialsGroupManager/src/org/anjocaido | |
| parent | be5c90e0b9f8477530f92a23652a6271aed92e70 (diff) | |
| download | Essentials-e638ef4f99d1d10015c173b9cecd93c02551db8e.tar Essentials-e638ef4f99d1d10015c173b9cecd93c02551db8e.tar.gz Essentials-e638ef4f99d1d10015c173b9cecd93c02551db8e.tar.lz Essentials-e638ef4f99d1d10015c173b9cecd93c02551db8e.tar.xz Essentials-e638ef4f99d1d10015c173b9cecd93c02551db8e.zip | |
Fixed a random null error upon a player portaling.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java | 4 |
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 f9363e04d..e4bb94592 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java @@ -378,7 +378,7 @@ public class BukkitPermissions { @EventHandler(priority = EventPriority.LOWEST)
public void onPlayerPortal(PlayerPortalEvent event) { // will portal into another world
- if (event.getTo() != null && !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());
}
}
@@ -390,7 +390,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.getFrom().getWorld().equals(event.getTo().getWorld()))) { // only if world actually changed
updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
}
}
|