diff --git a/World System.ipr b/World System.ipr index 0c9b267..7f467c7 100644 --- a/World System.ipr +++ b/World System.ipr @@ -1,79 +1,661 @@ - - - + + + + + + + + + + + + + + - + + + + + + - - + - + + + + + + + - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -83,7 +665,7 @@ @@ -94,11 +676,11 @@ - + - + - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index e183434..0949885 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ spigot { name = project.property("pluginName") authors = [project.property("author")] apiVersion = project.property("apiVersion") - depends = [ project.property("FAWE"), project.property("Vault")] + depends = [ project.property("WorldEdit"), project.property("Vault")] //Comands diff --git a/gradle.properties b/gradle.properties index bd45738..146d8db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,8 @@ author = Trainerlord & Butzlabben mcVersion = 1.16.2 apiVersion = 1.15 version = 2.4.11 +Vault = Vault +WorldEdit = WorldEdit +FAWE = FAWE + diff --git a/src/main/java/de/butzlabben/world/WorldSystem.java b/src/main/java/de/butzlabben/world/WorldSystem.java index 3804e16..c500da2 100644 --- a/src/main/java/de/butzlabben/world/WorldSystem.java +++ b/src/main/java/de/butzlabben/world/WorldSystem.java @@ -171,14 +171,15 @@ public class WorldSystem extends JavaPlugin { AutoUpdater.startAsync(); // Choose right creatoradapter for #16 - if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null + /*if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null && Bukkit.getPluginManager().getPlugin("WorldEdit") != null && PluginConfig.loadWorldsASync() - && !is1_13Plus) { + && !is1_13Plus) {*/ + try{ creator = new AsyncCreatorAdapter(); Bukkit.getConsoleSender() .sendMessage(PluginConfig.getPrefix() + "Found FAWE! Worlds now will be created asynchronously"); - } else { + }catch(Exception e) { creator = (c, sw, r) -> { Bukkit.getWorlds().add(c.createWorld()); if (sw != null)