From 83d240e29d6915fba85ea54dd1be8dbb686c0993 Mon Sep 17 00:00:00 2001
From: 502647092 <jtb1@163.com>
Date: Wed, 9 Dec 2015 12:33:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=85=BC=E5=AE=B9=E6=97=A7?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E5=88=97=E8=A1=A8...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 502647092 <jtb1@163.com>
---
 .../java/cn/citycraft/Yum/api/YumAPI.java     | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cn/citycraft/Yum/api/YumAPI.java b/src/main/java/cn/citycraft/Yum/api/YumAPI.java
index 5acf92a..2fa3df6 100644
--- a/src/main/java/cn/citycraft/Yum/api/YumAPI.java
+++ b/src/main/java/cn/citycraft/Yum/api/YumAPI.java
@@ -223,15 +223,34 @@ public class YumAPI {
 	 *            - 命令发送者
 	 */
 	public static void updateall(final CommandSender sender) {
-		final Map<String, Plugin> updatelist = UpdatePlugin.getUpdateList();
-		if (updatelist.size() > 0) {
-			for (final Entry<String, Plugin> updateplugin : UpdatePlugin.getUpdateList().entrySet()) {
-				updatefromyum(sender, updateplugin.getValue(), null);
+		try {
+
+			final Map<String, Plugin> updatelist = UpdatePlugin.getUpdateList();
+			if (updatelist.size() > 0) {
+				for (final Entry<String, Plugin> updateplugin : UpdatePlugin.getUpdateList().entrySet()) {
+					updatefromyum(sender, updateplugin.getValue(), null);
+				}
+				UpdatePlugin.clearList();
+				sender.sendMessage("§6更新: §c已下载所有需要插件的插件到 到update文件夹 重启后自动更新(或使用/yum upgrade直接升级)!");
+			} else {
+				sender.sendMessage("§6更新: §e未找到需要更新且可以用Yum处理的插件!");
+			}
+		} catch (final Exception | Error e) {
+			try {
+				final Map<Plugin, String> updatelist = UpdatePlugin.getList();
+				if (updatelist.size() > 0) {
+					for (final Entry<Plugin, String> updateplugin : UpdatePlugin.getList().entrySet()) {
+						updatefromyum(sender, updateplugin.getKey(), null);
+					}
+					UpdatePlugin.getList().clear();
+					sender.sendMessage("§6更新: §c已下载所有需要插件的插件到 到update文件夹 重启后自动更新(或使用/yum upgrade直接升级)!");
+				} else {
+					sender.sendMessage("§6更新: §e未找到需要更新且可以用Yum处理的插件!");
+				}
+			} catch (final Exception | Error e2) {
+				sender.sendMessage("§4错误: §c无法检索全体更新列表!");
+				sender.sendMessage("§4异常: §c" + e2.getMessage());
 			}
-			UpdatePlugin.clearList();
-			sender.sendMessage("§6更新: §c已下载所有需要插件的插件到 到update文件夹 重启后自动更新(或使用/yum upgrade直接升级)!");
-		} else {
-			sender.sendMessage("§6更新: §e未找到需要更新且可以用Yum处理的插件!");
 		}
 	}