From e638ef4f99d1d10015c173b9cecd93c02551db8e Mon Sep 17 00:00:00 2001 From: ElgarL Date: Sat, 21 Jan 2012 19:09:08 +0000 Subject: Fixed a random null error upon a player portaling. --- .../src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'EssentialsGroupManager/src/org/anjocaido') 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()); } } -- cgit v1.2.3