Changes config version number, adds a file check for schematics

NLthijs48 · Jan 6, 2015 · e6c5653 · e6c5653
1 parent ea31dfd
commit e6c5653
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/config.yml b/config.yml
@@ -40,7 +40,7 @@ postCommandErrors: true
 ## Enables / disables debug messages in the console, could be useful to figure out where errors come from
 debug: false
 ## Version of the config, do not change!
-version: 2.1.1
+version: 2.1.2
 
 
 # ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐

diff --git a/src/nl/evolutioncoding/areashop/regions/GeneralRegion.java b/src/nl/evolutioncoding/areashop/regions/GeneralRegion.java
@@ -48,7 +48,6 @@
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
 
-@SuppressWarnings("deprecation")
 public abstract class GeneralRegion {
 	protected YamlConfiguration config;
 	private static ArrayList<Material> canSpawnIn  = new ArrayList<Material>(Arrays.asList(Material.WOOD_DOOR, Material.WOODEN_DOOR, Material.SIGN_POST, Material.WALL_SIGN, Material.STONE_PLATE, Material.IRON_DOOR_BLOCK, Material.WOOD_PLATE, Material.TRAP_DOOR, Material.REDSTONE_LAMP_OFF, Material.REDSTONE_LAMP_ON, Material.DRAGON_EGG, Material.GOLD_PLATE, Material.IRON_PLATE));
@@ -841,7 +840,6 @@ public boolean saveRegionBlocks(String fileName) {
 	 */
 	public boolean restoreRegionBlocks(String fileName) {
 		boolean result = true;
-		// TODO: test world cast
 		EditSession editSession = plugin.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(new BukkitWorld(getWorld()), plugin.getConfig().getInt("maximumBlocks"));
 		ProtectedRegion region = plugin.getWorldGuard().getRegionManager(getWorld()).getRegion(getName());
 		if(region == null) {
@@ -854,7 +852,10 @@ public boolean restoreRegionBlocks(String fileName) {
 		// The path to save the schematic
 		File restoreFile = new File(plugin.getFileManager().getSchematicFolder() + File.separator + fileName + AreaShop.schematicExtension);
 
-
+		if(!restoreFile.exists() || !restoreFile.isFile()) {
+			plugin.getLogger().info("Did not restore region " + getName() + ", file does not exist: " + restoreFile);
+			return false;
+		}
 //		// NEW
 //		Closer closer = Closer.create();
 //        try {
@@ -894,6 +895,7 @@ public boolean restoreRegionBlocks(String fileName) {
 			plugin.getLogger().warning("Exeeded the block limit while restoring schematic of " + getName());
 			result = false;
 		} catch(IOException | DataException e) {
+			AreaShop.debug(e.getMessage());
 			result = false;
 		}
 		editSession.flushQueue();