From 417e720f66ece0cb1293ed77e396b5c9a3a135c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9D=8F=E9=BB=91?= <sky@asgard.me>
Date: Sun, 18 Feb 2018 19:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E8=87=B3?=
 =?UTF-8?q?=203.57?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复：Language2Value 对象的 asString() 方法无法识别变量的问题
修复：插件卸载时已注册的时间检查器不注销
修复：插件无法启动的语法错误
---
 src/main/src/me/skymc/taboolib/javashell/JavaShell.java    | 7 ++++++-
 .../me/skymc/taboolib/listener/ListenerPluginDisable.java  | 4 ++++
 .../me/skymc/taboolib/string/language2/Language2Value.java | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

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 + "[<ERROR-1>]" : languageValue.get(0);
+			return languageValue.size() == 0 ? ChatColor.DARK_RED + "[<ERROR-1>]" : setPlaceholder(languageValue.get(0), null);
 		}
 	}