Tabs are bad and we should feel bad for having them.

This commit is contained in:
GJ 2012-05-01 07:54:37 -04:00
parent 46268a7cf3
commit 6b5e615a23
2 changed files with 12 additions and 15 deletions

View File

@ -15,7 +15,6 @@ Version 1.3.07
+ Added permission nodes for Treasure & Magic Hunter for Fishing + Added permission nodes for Treasure & Magic Hunter for Fishing
+ Added config options for enabling/disabling specific double drops + Added config options for enabling/disabling specific double drops
+ Added automatic zip backup of flatfile database + Added automatic zip backup of flatfile database
= Fixed zip backup performing when running in SQL mode.
= Fixed bug where the permission node for Impact didn't work = Fixed bug where the permission node for Impact didn't work
= Fixed some bypass nodes defaulting true for Ops = Fixed some bypass nodes defaulting true for Ops
! Changed Mining to ignore blocks when the pick is enchanted with Silk Touch ! Changed Mining to ignore blocks when the pick is enchanted with Silk Touch

View File

@ -25,19 +25,18 @@ public class ZipLibrary {
private static File Leaderboards = new File(mcMMO.leaderboardDirectory); private static File Leaderboards = new File(mcMMO.leaderboardDirectory);
public static void mcMMObackup() throws IOException { public static void mcMMObackup() throws IOException {
if (Config.getInstance().getUseMySQL()) {
System.out.println("No Backup performed, in SQL Mode.");
return;
}
if (Config.getInstance().getUseMySQL()) { try {
System.out.println("No Backup performed, in SQL Mode."); if (BackupDir.mkdir()) {
return;
}
try {
if (BackupDir.mkdir()) {
mcMMO.p.getLogger().info("Created Backup Directory."); mcMMO.p.getLogger().info("Created Backup Directory.");
}
} catch (Exception e) {
mcMMO.p.getLogger().severe(e.toString());
} }
} catch (Exception e) {
mcMMO.p.getLogger().severe(e.toString());
}
//Generate the proper date for the backup filename //Generate the proper date for the backup filename
@ -58,8 +57,7 @@ public class ZipLibrary {
packZip(fileZip, sources); packZip(fileZip, sources);
} }
private static void packZip(File output, List<File> sources) throws IOException private static void packZip(File output, List<File> sources) throws IOException {
{
ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(output)); ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(output));
zipOut.setLevel(Deflater.DEFAULT_COMPRESSION); zipOut.setLevel(Deflater.DEFAULT_COMPRESSION);
@ -88,7 +86,7 @@ public class ZipLibrary {
private static void zipDir(ZipOutputStream zos, String path, File dir) throws IOException { private static void zipDir(ZipOutputStream zos, String path, File dir) throws IOException {
if (!dir.canRead()) { if (!dir.canRead()) {
System.out.println("Cannot read " + dir.getCanonicalPath() + " (maybe because of permissions)"); System.out.println("Cannot read " + dir.getCanonicalPath() + " (Maybe because of permissions?)");
return; return;
} }