From 8d49e0ecc021826b532130165e9c9f410c5e3adc Mon Sep 17 00:00:00 2001
From: Xefir <xefir@crystalyx.net>
Date: Fri, 11 May 2012 10:01:18 +0200
Subject: [PATCH] NPE when import from PermissionsBukkit (1.7.1)

---
 .../bukkit/simplyperms/imports/ImportPermBukkit.java | 12 ++++++++----
 src/plugin.yml                                       |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/net/crystalyx/bukkit/simplyperms/imports/ImportPermBukkit.java b/src/net/crystalyx/bukkit/simplyperms/imports/ImportPermBukkit.java
index 224408a..2c44ce5 100644
--- a/src/net/crystalyx/bukkit/simplyperms/imports/ImportPermBukkit.java
+++ b/src/net/crystalyx/bukkit/simplyperms/imports/ImportPermBukkit.java
@@ -31,8 +31,10 @@ public class ImportPermBukkit extends SimplyAPI implements ImportManager {
 					addPlayerGroup(player, group);
 				} 
 
-				for (Entry<String, Object> perm : permBukkit.getConfigurationSection("users/" + player + "/permissions").getValues(false).entrySet()) {
-					addPlayerPermission(player, perm.getKey(), (Boolean) perm.getValue());
+				if (permBukkit.getConfigurationSection("users/" + player + "/permissions") != null) {
+					for (Entry<String, Object> perm : permBukkit.getConfigurationSection("users/" + player + "/permissions").getValues(false).entrySet()) {
+						addPlayerPermission(player, perm.getKey(), (Boolean) perm.getValue());
+					}
 				}
 
 				for (String world : plugin.getKeys(permBukkit, "users/" + player + "/worlds")) {
@@ -43,8 +45,10 @@ public class ImportPermBukkit extends SimplyAPI implements ImportManager {
 			}
 
 			for (String group : plugin.getKeys(permBukkit, "groups")) {
-				for (Entry<String, Object> perms : permBukkit.getConfigurationSection("groups/" + group + "/permissions").getValues(false).entrySet()) {
-					addGroupPermission(group, perms.getKey(), (Boolean) perms.getValue());
+				if (permBukkit.getConfigurationSection("groups/" + group + "/permissions") != null) {
+					for (Entry<String, Object> perms : permBukkit.getConfigurationSection("groups/" + group + "/permissions").getValues(false).entrySet()) {
+						addGroupPermission(group, perms.getKey(), (Boolean) perms.getValue());
+					}
 				}
 
 				for (String world : plugin.getKeys(permBukkit, "groups/" + group + "/worlds")) {
diff --git a/src/plugin.yml b/src/plugin.yml
index c6d7bc7..41d54fd 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -2,7 +2,7 @@ name: SimplyPerms
 main: net.crystalyx.bukkit.simplyperms.SimplyPlugin
 author: Xefir Destiny
 website: http://www.crystalyx.net/
-version: 1.7
+version: 1.7.1
 softdepend: [ PermissionsBukkit ]
 commands:
   permissions: