502647092
/
Yum
mirror of https://e.coding.net/circlecloud/Yum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复插件重载时 提示插件已载入的问题 

Signed-off-by: 502647092 <admin@yumc.pw>
dev
502647092 2016-08-05 14:13:59 +08:00
parent fb1811d9f4
commit 6b5a91c73e
3 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/pw/yumc/Yum/api/YumAPI.java
View File

@ -127,7 +127,7 @@ public class YumAPI {
public static boolean install(final CommandSender sender, final String pluginname, final String url) { public static boolean install(final CommandSender sender, final String pluginname, final String url) {
final File pluginFile = new File(Bukkit.getUpdateFolderFile().getParentFile(), pluginname + ".jar"); final File pluginFile = new File(Bukkit.getUpdateFolderFile().getParentFile(), pluginname + ".jar");
if (download.run(sender, url, pluginFile)) { if (download.run(sender, url, pluginFile)) {
return plugman.load(sender, pluginFile, false); return plugman.load(sender, pluginFile);
} }
return false; return false;
} }

2
src/main/java/pw/yumc/Yum/inject/YumPluginLoader.java
View File

@ -33,7 +33,7 @@ public class YumPluginLoader implements PluginLoader {
private static boolean isInit = false; private static boolean isInit = false;
private static final String needRestart = "§6[§bYum§6] §c由于修改了服务器内部文件 §bYum §c无法直接重载 §4请重启服务器!"; private static final String needRestart = "§6[§bYum§6] §c由于修改了服务器内部文件 §bYum §c无法直接重载 §4请重启服务器!";
private static final YumPluginLoader yumPluginLoader = new YumPluginLoader(Bukkit.getServer()); private static final YumPluginLoader yumPluginLoader = new YumPluginLoader(Bukkit.getServer());
private final JavaPluginLoader internal_loader; public final JavaPluginLoader internal_loader;
private final Server server; private final Server server;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")

78
src/main/java/pw/yumc/Yum/managers/PluginsManager.java
View File

@ -15,6 +15,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -35,6 +36,7 @@ import org.bukkit.plugin.java.JavaPluginLoader;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import cn.citycraft.PluginHelper.ext.kit.Reflect;
import cn.citycraft.PluginHelper.utils.FileUtil; import cn.citycraft.PluginHelper.utils.FileUtil;
import cn.citycraft.PluginHelper.utils.StringUtil; import cn.citycraft.PluginHelper.utils.StringUtil;
import pw.yumc.Yum.inject.YumPluginLoader; import pw.yumc.Yum.inject.YumPluginLoader;
@ -321,20 +323,11 @@ public class PluginsManager {
* - 插件文件 * - 插件文件
* @return 是否成功 * @return 是否成功
*/ */
public boolean load(final CommandSender sender, final File pluginFile, final boolean clean) { public boolean load(final CommandSender sender, final File pluginFile) {
Plugin target = null; Plugin target = null;
final String name = pluginFile.getName(); final String name = pluginFile.getName();
String pname = name;
try { try {
try { try {
try {
final PluginDescriptionFile pluginDescriptionFile = main.getPluginLoader().getPluginDescription(pluginFile);
pname = pluginDescriptionFile.getName();
} catch (final InvalidDescriptionException e) {
sender.sendMessage("§4异常: §c" + e.getMessage());
sender.sendMessage("§4插件: §c" + name + " 的 plugin.yml 文件存在错误!");
return false;
}
target = Bukkit.getPluginManager().loadPlugin(pluginFile); target = Bukkit.getPluginManager().loadPlugin(pluginFile);
} catch (final UnsupportedClassVersionError e) { } catch (final UnsupportedClassVersionError e) {
sender.sendMessage("§4异常: §c" + e.getMessage()); sender.sendMessage("§4异常: §c" + e.getMessage());
@ -342,10 +335,6 @@ public class PluginsManager {
return false; return false;
} catch (final InvalidPluginException e) { } catch (final InvalidPluginException e) {
if (e.getMessage().equalsIgnoreCase("Plugin already initialized!")) { if (e.getMessage().equalsIgnoreCase("Plugin already initialized!")) {
if (!clean) {
YumPluginLoader.inject(pname);
return load(sender, pluginFile, true);
}
sender.sendMessage("§4异常: §c" + e.getMessage()); sender.sendMessage("§4异常: §c" + e.getMessage());
sender.sendMessage("§4插件: §c" + name + " 已载入到服务器!"); sender.sendMessage("§4插件: §c" + name + " 已载入到服务器!");
sender.sendMessage("§4注意: §c当前插件无法在运行时重载 请重启服务器!"); sender.sendMessage("§4注意: §c当前插件无法在运行时重载 请重启服务器!");
@ -422,7 +411,7 @@ public class PluginsManager {
return false; return false;
} }
} }
return load(sender, pluginFile, false); return load(sender, pluginFile);
} }
/** /**
@ -433,7 +422,7 @@ public class PluginsManager {
* @return 是否成功 * @return 是否成功
*/ */
public boolean load(final File pluginFile) { public boolean load(final File pluginFile) {
return load(Bukkit.getConsoleSender(), pluginFile, false); return load(Bukkit.getConsoleSender(), pluginFile);
} }
/** /**
@ -565,7 +554,7 @@ public class PluginsManager {
List<Plugin> plugins = null; List<Plugin> plugins = null;
Map<String, Plugin> lookupNames = null; Map<String, Plugin> lookupNames = null;
Map<String, Command> knownCommands = null; Map<String, Command> knownCommands = null;
final Map<Pattern, JavaPluginLoader> fileAssociations = null; Map<Pattern, JavaPluginLoader> fileAssociations = null;
if (pluginManager == null) { if (pluginManager == null) {
sender.sendMessage("§4异常: §c插件管理类反射获取失败!"); sender.sendMessage("§4异常: §c插件管理类反射获取失败!");
return false; return false;
@ -586,10 +575,10 @@ public class PluginsManager {
final Field knownCommandsField = commandMap.getClass().getDeclaredField("knownCommands"); final Field knownCommandsField = commandMap.getClass().getDeclaredField("knownCommands");
knownCommandsField.setAccessible(true); knownCommandsField.setAccessible(true);
knownCommands = (Map<String, Command>) knownCommandsField.get(commandMap); knownCommands = (Map<String, Command>) knownCommandsField.get(commandMap);
// XXX 暂时用不到
// final Field fileAssociationsField = pluginManager.getClass().getDeclaredField("fileAssociations"); final Field fileAssociationsField = pluginManager.getClass().getDeclaredField("fileAssociations");
// fileAssociationsField.setAccessible(true); fileAssociationsField.setAccessible(true);
// fileAssociations = (Map<Pattern, JavaPluginLoader>) fileAssociationsField.get(pluginManager); fileAssociations = (Map<Pattern, JavaPluginLoader>) fileAssociationsField.get(pluginManager);
} catch (final Exception e) { } catch (final Exception e) {
sender.sendMessage("§4异常: §c" + e.getMessage() + " 插件 §b" + name + " §c卸载失败!"); sender.sendMessage("§4异常: §c" + e.getMessage() + " 插件 §b" + name + " §c卸载失败!");
@ -620,39 +609,38 @@ public class PluginsManager {
} }
} }
} }
// try { try {
// if (fileAssociations != null) { if (fileAssociations != null) {
// // XXX 不能移除 会导致无法加载 for (final Entry<Pattern, JavaPluginLoader> entry : fileAssociations.entrySet()) {
// for (final Iterator<Entry<Pattern, JavaPluginLoader>> filter = fileAssociations.entrySet().iterator(); filter.hasNext();) { final Matcher match = entry.getKey().matcher(getPluginFile(next).getName());
// final Entry<Pattern, JavaPluginLoader> entry = filter.next(); if (match.find()) {
// final Matcher match = entry.getKey().matcher(getPluginFile(next).getName()); PluginLoader pluginLoader = entry.getValue();
// if (match.find()) { if (pluginLoader instanceof YumPluginLoader) {
// final JavaPluginLoader pluginLoader = entry.getValue(); pluginLoader = ((YumPluginLoader) pluginLoader).internal_loader;
// final Field loadersField = pluginLoader.getClass().getDeclaredField("loaders"); }
// loadersField.setAccessible(true); final Field loadersField = pluginLoader.getClass().getDeclaredField("loaders");
// final Map<String, URLClassLoader> loaders = (Map<String, URLClassLoader>) loadersField.get(pluginLoader); loadersField.setAccessible(true);
// // XXX 不能移除 会导致无法调用其他插件 final Map<String, URLClassLoader> loaders = (Map<String, URLClassLoader>) loadersField.get(pluginLoader);
// loaders.clear(); for (final Entry<String, URLClassLoader> entry2 : loaders.entrySet()) {
// sender.sendMessage("§6卸载: §a移除插件 §b" + name + " §a的类实例缓存!"); Reflect.on(entry2.getValue()).set("pluginInit", null).set("plugin", null);
// } }
// } sender.sendMessage("§6卸载: §a移除插件 §b" + name + " §a的类实例缓存!");
// } }
// } catch (final Exception e) { }
// e.printStackTrace(); }
// } } catch (final Exception e) {
e.printStackTrace();
}
sender.sendMessage("§6卸载: §a注销插件 §b" + name + " §a的所有命令!"); sender.sendMessage("§6卸载: §a注销插件 §b" + name + " §a的所有命令!");
final ClassLoader cl = next.getClass().getClassLoader(); final ClassLoader cl = next.getClass().getClassLoader();
try { try {
((URLClassLoader) cl).close(); ((URLClassLoader) cl).close();
} catch (final IOException ex) { } catch (final IOException ex) {
ex.printStackTrace();
} }
System.gc(); System.gc();
} }
} }
if (!pluginVersion.isEmpty()) if (!pluginVersion.isEmpty()) {
{
sender.sendMessage("§6卸载: §a插件 §b" + name + " §a版本 §d" + pluginVersion + " §a已成功卸载!"); sender.sendMessage("§6卸载: §a插件 §b" + name + " §a版本 §d" + pluginVersion + " §a已成功卸载!");
return true; return true;
} }