Merge pull request #38 from YululiServer/Ver3.x

Ver 3.0.7 ---> Ver 3.0.8 : バグ修正

Author: kanasaki15

build.gradle

@@ -3,12 +3,12 @@ import org.apache.tools.ant.filters.ReplaceTokens
 apply plugin: 'java'
 
 group = 'xyz.n7mn.dev.yululi'
-version = '3.0.7'
+version = '3.0.8'
+tasks.withType(AbstractCompile)*.options*.encoding = tasks.withType(GroovyCompile)*.groovyOptions*.encoding = 'UTF-8'
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
-tasks.withType(AbstractCompile)*.options*.encoding = tasks.withType(GroovyCompile)*.groovyOptions*.encoding = 'UTF-8'
 
 
 repositories {
@@ -31,6 +31,7 @@ dependencies {
     compileOnly 'xyz.acrylicstyle.grid:grid-api:1.16.3-R0.1-SNAPSHOT'
     compileOnly 'net.luckperms:api:5.0'
     compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.32.3.2'
+    compileOnly files(fileTree(dir: 'lib', includes: ['*.jar']))
 }
 
 processResources {

src/main/java/xyz/n7mn/dev/yululi/itemframeprotectionplugin/AutoRemoveTimer.java

@@ -6,11 +6,9 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
-import xyz.n7mn.dev.yululi.itemframeprotectionplugin.data.DataAPI;
-import xyz.n7mn.dev.yululi.itemframeprotectionplugin.data.DropItemData;
-import xyz.n7mn.dev.yululi.itemframeprotectionplugin.data.FrameData;
-import xyz.n7mn.dev.yululi.itemframeprotectionplugin.data.ItemFrameProtectDeleteEvent;
+import xyz.n7mn.dev.yululi.itemframeprotectionplugin.data.*;
 
+import javax.swing.*;
 import java.util.List;
 
 class AutoRemoveTimer extends BukkitRunnable {
@@ -30,6 +28,7 @@ public void run() {
 
 
             try {
+
                 api.cacheToSQL();
 
                 List<FrameData> FrameDataList = api.getListByFrameData(true);
@@ -40,13 +39,14 @@ public void run() {
                     Entity entity = Bukkit.getEntity(frameData.getItemFrameUUID());
                     if (entity == null){
                         api.deleteTableByFrame(frameData.getItemFrameUUID());
-                        Bukkit.getServer().getPluginManager().callEvent(new ItemFrameProtectDeleteEvent(frameData.getItemFrameUUID()));
+
+                        Bukkit.getScheduler().runTask(plugin, () -> Bukkit.getServer().getPluginManager().callEvent(new ItemFrameProtectDeleteEvent(frameData.getItemFrameUUID())));
                         continue;
                     }
 
                     if (entity.getType() != EntityType.ITEM_FRAME){
                         api.deleteTableByFrame(frameData.getItemFrameUUID());
-                        Bukkit.getServer().getPluginManager().callEvent(new ItemFrameProtectDeleteEvent(frameData.getItemFrameUUID()));
+                        Bukkit.getScheduler().runTask(plugin, () -> Bukkit.getServer().getPluginManager().callEvent(new ItemFrameProtectDeleteEvent(frameData.getItemFrameUUID())));
                     }
 
                 }
@@ -66,6 +66,7 @@ public void run() {
 
                 }
 
+
                 FrameDataList.clear();
                 DropItemList.clear();