From 14d943826835e424c1a90ebe8c0c314502626e51 Mon Sep 17 00:00:00 2001
From: 502647092 <admin@yumc.pw>
Date: Thu, 28 Jul 2016 18:39:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86BUG?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dload=E7=9B=B4=E6=8E=A5=E8=BD=BD=E5=85=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84NPE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 502647092 <admin@yumc.pw>
---
 pom.xml                                                 | 7 ++++---
 src/main/java/pw/yumc/Yum/commands/YumCommand.java      | 7 +++++++
 src/main/java/pw/yumc/Yum/listeners/PluginListener.java | 2 +-
 src/main/java/pw/yumc/Yum/managers/ConfigManager.java   | 2 +-
 src/main/java/pw/yumc/Yum/managers/PluginsManager.java  | 2 +-
 src/main/java/pw/yumc/Yum/models/PluginInfo.java        | 2 +-
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 33a61f2..46f5ddb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,17 +32,17 @@
 					<minimizeJar>true</minimizeJar>
 					<artifactSet>
 						<includes>
-							<include>cn.citycraft:PluginHelper</include>
 							<include>pw.yumc:YumCore</include>
+							<include>cn.citycraft:PluginHelper</include>
 						</includes>
 					</artifactSet>
 					<relocations>
 						<relocation>
-							<pattern>cn.citycraft.PluginHelper</pattern>
+							<pattern>pw.yumc.YumCore</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
 						</relocation>
 						<relocation>
-							<pattern>pw.yumc.YumCore</pattern>
+							<pattern>cn.citycraft.PluginHelper</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
 						</relocation>
 					</relocations>
@@ -66,6 +66,7 @@
 		<update.description>§a全新 2.X 版本 更多守护与优化</update.description>
 		<update.changes>
 			§c注意  §6- §aYum更新需要§d重启服务器!§c重启服务器!§4重启服务器!;
+			§b2.7.1 §6- §c修复部分BUG(load可直接载入文件)...;
 			§b2.7.0 §6- §d完善能耗监控流程...;
 			§b      §6- §c报错§6/§d能耗§a添加日志记录;
 			§b      §6- §a文件处理添加复制命令;
diff --git a/src/main/java/pw/yumc/Yum/commands/YumCommand.java b/src/main/java/pw/yumc/Yum/commands/YumCommand.java
index 9104061..4abd691 100644
--- a/src/main/java/pw/yumc/Yum/commands/YumCommand.java
+++ b/src/main/java/pw/yumc/Yum/commands/YumCommand.java
@@ -31,6 +31,7 @@ import pw.yumc.Yum.models.BukkitDev;
 import pw.yumc.Yum.models.BukkitDev.Files;
 import pw.yumc.Yum.models.BukkitDev.Projects;
 import pw.yumc.Yum.models.RepoSerialization.Repositories;
+import pw.yumc.YumCore.bukkit.Log;
 import pw.yumc.YumCore.commands.CommandArgument;
 import pw.yumc.YumCore.commands.CommandExecutor;
 import pw.yumc.YumCore.commands.CommandManager;
@@ -434,6 +435,12 @@ public class YumCommand implements Listener, CommandExecutor {
         }
     }
 
+    @Cmd
+    public void test(final CommandArgument e) {
+        Log.toSender(e.getSender(), "Test");
+        Log.toSender(e.getSender(), new String[] { "Test1", "Test2", "Test3" });
+    }
+
     @Cmd(minimumArguments = 1)
     @Help(value = "卸载插件", possibleArguments = "<插件名称>")
     @Sort(4)
diff --git a/src/main/java/pw/yumc/Yum/listeners/PluginListener.java b/src/main/java/pw/yumc/Yum/listeners/PluginListener.java
index 48f01e8..aaf34c3 100644
--- a/src/main/java/pw/yumc/Yum/listeners/PluginListener.java
+++ b/src/main/java/pw/yumc/Yum/listeners/PluginListener.java
@@ -6,11 +6,11 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 
-import cn.citycraft.PluginHelper.bukkit.P;
 import cn.citycraft.PluginHelper.kit.PluginKit;
 import pw.yumc.Yum.api.YumAPI;
 import pw.yumc.Yum.managers.ConfigManager;
 import pw.yumc.Yum.managers.MonitorManager;
+import pw.yumc.YumCore.bukkit.P;
 
 /**
  *
diff --git a/src/main/java/pw/yumc/Yum/managers/ConfigManager.java b/src/main/java/pw/yumc/Yum/managers/ConfigManager.java
index 57942b3..4b0bcac 100644
--- a/src/main/java/pw/yumc/Yum/managers/ConfigManager.java
+++ b/src/main/java/pw/yumc/Yum/managers/ConfigManager.java
@@ -4,9 +4,9 @@ import java.util.List;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import cn.citycraft.PluginHelper.bukkit.P;
 import cn.citycraft.PluginHelper.config.FileConfig;
 import cn.citycraft.PluginHelper.sql.DataBase;
+import pw.yumc.YumCore.bukkit.P;
 
 public class ConfigManager {
     public final static String ENABLE = "Enable";
diff --git a/src/main/java/pw/yumc/Yum/managers/PluginsManager.java b/src/main/java/pw/yumc/Yum/managers/PluginsManager.java
index fd420cc..5848b86 100644
--- a/src/main/java/pw/yumc/Yum/managers/PluginsManager.java
+++ b/src/main/java/pw/yumc/Yum/managers/PluginsManager.java
@@ -370,7 +370,7 @@ public class PluginsManager {
      * @return 是否成功
      */
     public boolean load(CommandSender sender, final String name) {
-        String filename = null;
+        String filename = name;
         if (sender == null) {
             sender = Bukkit.getConsoleSender();
         }
diff --git a/src/main/java/pw/yumc/Yum/models/PluginInfo.java b/src/main/java/pw/yumc/Yum/models/PluginInfo.java
index 3d3a266..6b80a47 100644
--- a/src/main/java/pw/yumc/Yum/models/PluginInfo.java
+++ b/src/main/java/pw/yumc/Yum/models/PluginInfo.java
@@ -6,11 +6,11 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 
 import cn.citycraft.PluginHelper.PluginHelperLogger;
-import cn.citycraft.PluginHelper.bukkit.Log;
 import cn.citycraft.PluginHelper.utils.IOUtil;
 import pw.yumc.Yum.models.RepoSerialization.Plugin;
 import pw.yumc.Yum.models.RepoSerialization.TagInfo;
 import pw.yumc.Yum.models.RepoSerialization.URLType;
+import pw.yumc.YumCore.bukkit.Log;
 
 public class PluginInfo implements Serializable {
     public static String NMSVersion;