diff --git a/src/main/src/me/skymc/taboolib/javashell/JavaShell.java b/src/main/src/me/skymc/taboolib/javashell/JavaShell.java index 8eafd00..b20cf24 100644 --- a/src/main/src/me/skymc/taboolib/javashell/JavaShell.java +++ b/src/main/src/me/skymc/taboolib/javashell/JavaShell.java @@ -70,7 +70,6 @@ public class JavaShell { javaShellFolder = new File(Main.getInst().getDataFolder(), "JavaShells"); if (!javaShellFolder.exists()) { - Main.getInst().saveResource("JavaShells/lib/com.sun.tools.jar", true); Main.getInst().saveResource("JavaShells/scripts/-testshell.java", true); } @@ -89,6 +88,12 @@ public class JavaShell { libFolder.mkdir(); } + File tools = new File(Main.getInst().getDataFolder(), "JavaShells/lib/com.sun.tools.jar"); + if (!tools.exists()) { + MsgUtils.warn("&4JavaShell &c工具的必要依赖 &4com.sun.tools.jar &c不存在, 功能关闭!"); + return; + } + loadLibrary(); new BukkitRunnable() { diff --git a/src/main/src/me/skymc/taboolib/listener/ListenerPluginDisable.java b/src/main/src/me/skymc/taboolib/listener/ListenerPluginDisable.java index 2c8866d..7ed7cc1 100644 --- a/src/main/src/me/skymc/taboolib/listener/ListenerPluginDisable.java +++ b/src/main/src/me/skymc/taboolib/listener/ListenerPluginDisable.java @@ -7,6 +7,7 @@ import org.bukkit.event.server.PluginDisableEvent; import me.skymc.taboolib.message.MsgUtils; import me.skymc.taboolib.mysql.MysqlUtils; import me.skymc.taboolib.mysql.protect.MySQLConnection; +import me.skymc.taboolib.timecycle.TimeCycleManager; public class ListenerPluginDisable implements Listener { @@ -23,6 +24,9 @@ public class ListenerPluginDisable implements Listener { if (i > 0) { MsgUtils.send("ֹͣ &f" + e.getPlugin().getName() + "&7 &f" + i + "&7 ݿ"); } + + // עʱ + TimeCycleManager.cancel(e.getPlugin()); } } diff --git a/src/main/src/me/skymc/taboolib/string/language2/Language2Value.java b/src/main/src/me/skymc/taboolib/string/language2/Language2Value.java index 136642e..2c72936 100644 --- a/src/main/src/me/skymc/taboolib/string/language2/Language2Value.java +++ b/src/main/src/me/skymc/taboolib/string/language2/Language2Value.java @@ -218,7 +218,7 @@ public class Language2Value { return new Language2Json(this, null).getText().toString(); } else { - return languageValue.size() == 0 ? ChatColor.DARK_RED + "[]" : languageValue.get(0); + return languageValue.size() == 0 ? ChatColor.DARK_RED + "[]" : setPlaceholder(languageValue.get(0), null); } }