Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2014-07-08 12:44:26 -07:00
commit 2ccb27065c
2 changed files with 14 additions and 6 deletions

View File

@ -357,11 +357,21 @@ public class MapParser extends JavaPlugin implements Listener
if (_curParse.Update())
{
_worldManager.finalizeParsedWorld(_curParse.getGameType(), _curParse.getWorld());
Announce("Parse Completed!");
Announce("Cleaning and Creating ZIP...");
try
{
_worldManager.finalizeParsedWorld(_curParse.getGameType(), _curParse.getWorld());
}
catch (Exception e)
{
Announce("Creating ZIP Failed! Please Try Again!");
e.printStackTrace();
}
_curParse = null;
Announce("Parse Completed!");
}
}

View File

@ -98,9 +98,7 @@ public class WorldManager
FileUtils.deleteQuietly(new File(world.getName() + File.separator + file.getName()));
}
//System.out.println("Path A: " + Paths.get("").toAbsolutePath().toString());
//System.out.println("Path B: " + Paths.get("").toAbsolutePath().toString() + File.separator + world.getName() + File.separator);
ZipUtil.ZipFolders(Paths.get(world.getName()).toAbsolutePath().toString(), world.getName() + ".zip", dirList, fileList);
try