From 3c5e4c2cf6a1690d56bd333546c0f146ae202823 Mon Sep 17 00:00:00 2001
From: 502647092 <admin@yumc.pw>
Date: Fri, 16 Dec 2016 16:39:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 502647092 <admin@yumc.pw>
---
 pom.xml                                       | 208 +++++++++---------
 .../QuickShop/Config/ConfigManager.java       |   4 +
 2 files changed, 108 insertions(+), 104 deletions(-)

diff --git a/pom.xml b/pom.xml
index 354f6aa..343c39c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,106 +1,106 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.maxgamer</groupId>
-	<artifactId>QuickShop</artifactId>
-	<version>2.0</version>
-	<description>快捷商店重置版本...</description>
-	<build>
-		<finalName>${project.name}</finalName>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<createDependencyReducedPom>false</createDependencyReducedPom>
-					<minimizeJar>true</minimizeJar>
-					<artifactSet>
-						<includes>
-							<include>pw.yumc:YumCore</include>
-						</includes>
-					</artifactSet>
-					<relocations>
-						<relocation>
-							<pattern>pw.yumc.YumCore</pattern>
-							<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
-						</relocation>
-					</relocations>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<ciManagement>
-		<system>Jenkins</system>
-		<url>http://ci.yumc.pw/job/${project.artifactId}/</url>
-	</ciManagement>
-	<properties>
-		<env.GIT_COMMIT>DEBUG</env.GIT_COMMIT>
-		<update.description>§a全新版本 §c虚拟悬浮物(橙子提供 对 就是那个汉化COI的逗比)§e7老板修复逗比BUG...</update.description>
-		<update.changes>
-			§b1.9.5 - §a1.10+兼容虚拟悬浮物...;
-			§b1.9.4 - §a1.9+兼容虚拟悬浮物...;
-			§b1.9.3 - §a木牌第一行显示配置文件的guititle内容...;
-		</update.changes>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<repositories>
-		<repository>
-			<id>yumc-repo</id>
-			<url>http://repo.yumc.pw/content/groups/public/</url>
-		</repository>
-		<repository>
-			<id>dmulloy</id>
-			<url>http://repo.dmulloy2.net/content/groups/public/</url>
-		</repository>
-	</repositories>
-	<distributionManagement>
-		<repository>
-			<id>jtb</id>
-			<name>YUMC</name>
-			<url>http://repo.yumc.pw/content/repositories/yumcenter/</url>
-		</repository>
-	</distributionManagement>
-	<dependencies>
-		<dependency>
-			<groupId>pw.yumc</groupId>
-			<artifactId>YumCore</artifactId>
-			<type>jar</type>
-			<version>1.5</version>
-		</dependency>
-		<dependency>
-			<groupId>io.github.Cnly.WowSuchCleaner</groupId>
-			<artifactId>WowSuchCleaner</artifactId>
-			<version>1.6.5</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sk89q</groupId>
-			<artifactId>WorldEdit</artifactId>
-			<version>5.4.5</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/WorldEdit.jar</systemPath>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.maxgamer</groupId>
+    <artifactId>QuickShop</artifactId>
+    <version>2.0.1</version>
+    <description>快捷商店重置版本...</description>
+    <build>
+        <finalName>${project.name}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <minimizeJar>true</minimizeJar>
+                    <artifactSet>
+                        <includes>
+                            <include>pw.yumc:YumCore</include>
+                        </includes>
+                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>pw.yumc.YumCore</pattern>
+                            <shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <ciManagement>
+        <system>Jenkins</system>
+        <url>http://ci.yumc.pw/job/${project.artifactId}/</url>
+    </ciManagement>
+    <properties>
+        <env.GIT_COMMIT>DEBUG</env.GIT_COMMIT>
+        <update.description>§a全新版本 §c虚拟悬浮物(橙子提供 对 就是那个汉化COI的逗比)§e7老板修复逗比BUG...</update.description>
+        <update.changes>
+            §b2.0.1 - §a使用新类库 兼容最新版本...;
+            §b1.9.5 - §a1.10+兼容虚拟悬浮物...;
+            §b1.9.4 - §a1.9+兼容虚拟悬浮物...;
+        </update.changes>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <repositories>
+        <repository>
+            <id>yumc-repo</id>
+            <url>http://repo.yumc.pw/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>dmulloy</id>
+            <url>http://repo.dmulloy2.net/content/groups/public/</url>
+        </repository>
+    </repositories>
+    <distributionManagement>
+        <repository>
+            <id>jtb</id>
+            <name>YUMC</name>
+            <url>http://repo.yumc.pw/content/repositories/yumcenter/</url>
+        </repository>
+    </distributionManagement>
+    <dependencies>
+        <dependency>
+            <groupId>pw.yumc</groupId>
+            <artifactId>YumCore</artifactId>
+            <type>jar</type>
+            <version>1.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.Cnly.WowSuchCleaner</groupId>
+            <artifactId>WowSuchCleaner</artifactId>
+            <version>1.6.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>WorldEdit</artifactId>
+            <version>5.4.5</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/WorldEdit.jar</systemPath>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/java/org/maxgamer/QuickShop/Config/ConfigManager.java b/src/main/java/org/maxgamer/QuickShop/Config/ConfigManager.java
index 506a25e..77b4045 100644
--- a/src/main/java/org/maxgamer/QuickShop/Config/ConfigManager.java
+++ b/src/main/java/org/maxgamer/QuickShop/Config/ConfigManager.java
@@ -2,6 +2,7 @@ package org.maxgamer.QuickShop.Config;
 
 import java.util.*;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
@@ -105,6 +106,9 @@ public class ConfigManager {
                 }
             }
         }
+        if (Bukkit.getVersion().contains("Paper") || Bukkit.getVersion().contains("Torch")) {
+            Log.d("辣鸡 Paper 毁我异步命令!");
+        }
         if (config.getBoolean("usemagiclib", true)) {
             try {
                 plugin.getLogger().info("启用魔改库 尝试启动中...");