diff --git a/AreaShop/pom.xml b/AreaShop/pom.xml index 609d80c..d723660 100644 --- a/AreaShop/pom.xml +++ b/AreaShop/pom.xml @@ -99,14 +99,14 @@ worldedit system any - ${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-#3817.jar + ${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-01.jar com.sk89q worldguard system any - ${project.basedir}/../dependencies/worldguard-legacy-7.0.0-#1735.jar + ${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta01.jar net.milkbowl.vault diff --git a/WorldEdit 7/pom.xml b/WorldEdit 7/pom.xml index 04012ec..b378c90 100644 --- a/WorldEdit 7/pom.xml +++ b/WorldEdit 7/pom.xml @@ -31,14 +31,14 @@ worldedit system any - ${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-#3817.jar + ${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-01.jar com.sk89q worldguard system any - ${project.basedir}/../dependencies/worldguard-legacy-7.0.0-#1735.jar + ${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta01.jar - \ No newline at end of file + diff --git a/WorldEdit 7/src/main/java/me/wiefferink/areashop/handlers/WorldEditHandler7.java b/WorldEdit 7/src/main/java/me/wiefferink/areashop/handlers/WorldEditHandler7.java index ac08b60..a543b4e 100644 --- a/WorldEdit 7/src/main/java/me/wiefferink/areashop/handlers/WorldEditHandler7.java +++ b/WorldEdit 7/src/main/java/me/wiefferink/areashop/handlers/WorldEditHandler7.java @@ -63,7 +63,7 @@ public class WorldEditHandler7 extends WorldEditInterface { @Override public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) { File file = null; - for (BuiltInClipboardFormat format : BuiltInClipboardFormat.values()) { + for (ClipboardFormat format : ClipboardFormats.getAll()) { for (String extension : format.getFileExtensions()) { if (new File(rawFile.getAbsolutePath() + "." + extension).exists()) { file = new File(rawFile.getAbsolutePath() + "." + extension); @@ -142,6 +142,10 @@ public class WorldEditHandler7 extends WorldEditInterface { pluginInterface.getLogger().warning("An error occured while restoring schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace"); pluginInterface.debugI(ExceptionUtils.getStackTrace(e)); return false; + } catch (Exception e) { + pluginInterface.getLogger().warning("crashed during restore of " + regionInterface.getName()); + pluginInterface.debugI(ExceptionUtils.getStackTrace(e)); + return false; } editSession.flushQueue(); return true; @@ -180,6 +184,10 @@ public class WorldEditHandler7 extends WorldEditInterface { pluginInterface.getLogger().warning("An error occured while saving schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace"); pluginInterface.debugI(ExceptionUtils.getStackTrace(e)); return false; + } catch (Exception e) { + pluginInterface.getLogger().warning("crashed during save of " + regionInterface.getName()); + pluginInterface.debugI(ExceptionUtils.getStackTrace(e)); + return false; } return true; } diff --git a/WorldGuard 7/pom.xml b/WorldGuard 7/pom.xml index e2cfb73..1c80c34 100644 --- a/WorldGuard 7/pom.xml +++ b/WorldGuard 7/pom.xml @@ -31,7 +31,7 @@ worldedit system any - ${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-#3817.jar + ${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-01.jar me.wiefferink @@ -52,7 +52,7 @@ worldguard system any - ${project.basedir}/../dependencies/worldguard-legacy-7.0.0-#1735.jar + ${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta01.jar - \ No newline at end of file + diff --git a/dependencies/worldedit-bukkit-7.0.0-#3817.jar b/dependencies/worldedit-bukkit-7.0.0-beta-01.jar similarity index 56% rename from dependencies/worldedit-bukkit-7.0.0-#3817.jar rename to dependencies/worldedit-bukkit-7.0.0-beta-01.jar index 101f533..635f24e 100644 Binary files a/dependencies/worldedit-bukkit-7.0.0-#3817.jar and b/dependencies/worldedit-bukkit-7.0.0-beta-01.jar differ diff --git a/dependencies/worldguard-legacy-7.0.0-#1735.jar b/dependencies/worldguard-legacy-7.0.0-beta01.jar similarity index 56% rename from dependencies/worldguard-legacy-7.0.0-#1735.jar rename to dependencies/worldguard-legacy-7.0.0-beta01.jar index 013a107..f8e73e3 100644 Binary files a/dependencies/worldguard-legacy-7.0.0-#1735.jar and b/dependencies/worldguard-legacy-7.0.0-beta01.jar differ