From 6341c07819544cf0d2c8e066478d356985db399b Mon Sep 17 00:00:00 2001
From: j502647092 <jtb1@163.com>
Date: Sat, 24 Oct 2015 23:12:29 +0800
Subject: [PATCH] fix config null and add command color...

Signed-off-by: j502647092 <jtb1@163.com>
---
 .../ProtectItem/commands/CommandBan.java      |  6 ++---
 .../ProtectItem/commands/CommandUnban.java    |  6 ++---
 .../ProtectItem/utils/ItemManager.java        | 26 ++++++++++---------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/java/cn/citycraft/ProtectItem/commands/CommandBan.java b/src/main/java/cn/citycraft/ProtectItem/commands/CommandBan.java
index 1975d4d..99d5db3 100644
--- a/src/main/java/cn/citycraft/ProtectItem/commands/CommandBan.java
+++ b/src/main/java/cn/citycraft/ProtectItem/commands/CommandBan.java
@@ -30,16 +30,16 @@ public class CommandBan extends BaseCommand {
 		switch (args.length) {
 		case 0:
 			plugin.getItemManager().banItem(item);
-			p.sendMessage("当前物品 " + itemname + " 已被禁封!");
+			p.sendMessage(plugin.pluginname + "§c当前物品 §a" + itemname + " §c已被禁封!");
 			return;
 		case 1:
 
 			try {
 				final ActionType action = Enum.valueOf(ActionType.class, args[0]);
 				plugin.getItemManager().banItem(item, action);
-				p.sendMessage("当前物品 " + itemname + " 已被禁封 操作" + action.toString() + "!");
+				p.sendMessage(plugin.pluginname + "§c当前物品 §a" + itemname + " §c已被禁封 §c操作 §b" + action.toString() + "!");
 			} catch (final Exception e) {
-				p.sendMessage("未知的操作类型" + args[0] + "!");
+				p.sendMessage(plugin.pluginname + "§c未知的操作类型" + args[0] + "!");
 			}
 		}
 	}
diff --git a/src/main/java/cn/citycraft/ProtectItem/commands/CommandUnban.java b/src/main/java/cn/citycraft/ProtectItem/commands/CommandUnban.java
index bb39a06..1178083 100644
--- a/src/main/java/cn/citycraft/ProtectItem/commands/CommandUnban.java
+++ b/src/main/java/cn/citycraft/ProtectItem/commands/CommandUnban.java
@@ -30,16 +30,16 @@ public class CommandUnban extends BaseCommand {
 		switch (args.length) {
 		case 0:
 			plugin.getItemManager().unBanItem(item);
-			p.sendMessage("当前物品 " + itemname + " 已被解禁!");
+			p.sendMessage(plugin.pluginname + "§a当前物品 " + itemname + " 已被解禁!");
 			return;
 		case 1:
 
 			try {
 				final ActionType action = Enum.valueOf(ActionType.class, args[0]);
 				plugin.getItemManager().unBanItem(item, action);
-				p.sendMessage("当前物品 " + itemname + " 已被解禁 操作" + action.toString() + "!");
+				p.sendMessage(plugin.pluginname + "§a当前物品 " + itemname + " 已被解禁 操作 §b" + action.toString() + "!");
 			} catch (final Exception e) {
-				p.sendMessage("未知的操作类型" + args[0] + "!");
+				p.sendMessage(plugin.pluginname + "§c未知的操作类型" + args[0] + "!");
 			}
 		}
 	}
diff --git a/src/main/java/cn/citycraft/ProtectItem/utils/ItemManager.java b/src/main/java/cn/citycraft/ProtectItem/utils/ItemManager.java
index 2fd7aed..de9bbe8 100644
--- a/src/main/java/cn/citycraft/ProtectItem/utils/ItemManager.java
+++ b/src/main/java/cn/citycraft/ProtectItem/utils/ItemManager.java
@@ -8,6 +8,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
@@ -22,21 +23,22 @@ public class ItemManager {
 	public ItemManager(final ProtectItem main) {
 		plugin = main;
 		itemconfig = new FileConfig(plugin, "banitems.yml");
-		final Set<String> items = itemconfig.getConfigurationSection("banitems").getKeys(false);
-		if (items != null) {
-			for (final String banitem : items) {
-				final List<ActionType> actlist = new ArrayList<ActionType>();
-				for (final String action : itemconfig.getStringList("banitems." + banitem)) {
-					try {
-						final ActionType act = Enum.valueOf(ActionType.class, action);
-						actlist.add(act);
-					} catch (final Exception e) {
+		final ConfigurationSection cfg = itemconfig.getConfigurationSection("banitems");
+		if (cfg != null) {
+			final Set<String> items = itemconfig.getConfigurationSection("banitems").getKeys(false);
+			if (items != null) {
+				for (final String banitem : items) {
+					final List<ActionType> actlist = new ArrayList<ActionType>();
+					for (final String action : itemconfig.getStringList("banitems." + banitem)) {
+						try {
+							final ActionType act = Enum.valueOf(ActionType.class, action);
+							actlist.add(act);
+						} catch (final Exception e) {
+						}
 					}
+					itemlist.put(banitem, actlist);
 				}
-				itemlist.put(banitem, actlist);
 			}
-		} else {
-			itemlist = new HashMap<String, List<ActionType>>();
 		}
 	}