Fix the Cache

This commit is contained in:
Xephi 2014-08-30 04:05:22 +02:00
parent 907d70d60d
commit 6e17b540f5
2 changed files with 47 additions and 42 deletions

View File

@ -71,6 +71,7 @@ public class FileCache {
file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + path + File.separator + "inventory" + File.separator + i + ".cache"); file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + path + File.separator + "inventory" + File.separator + i + ".cache");
file.createNewFile(); file.createNewFile();
writer = new FileWriter(file); writer = new FileWriter(file);
if (item != null) {
if (item.getType() == Material.AIR) { if (item.getType() == Material.AIR) {
writer.write("AIR"); writer.write("AIR");
writer.close(); writer.close();
@ -108,6 +109,9 @@ public class FileCache {
writer.write("attribute=" + a.getName() + ";" + a.getAttributeType().getMinecraftId() + ";" + a.getAmount() + ";" + a.getOperation().getId() + ";" + a.getUUID().toString()); writer.write("attribute=" + a.getName() + ";" + a.getAttributeType().getMinecraftId() + ";" + a.getAmount() + ";" + a.getOperation().getId() + ";" + a.getUUID().toString());
} }
} }
} else {
writer.write("AIR");
}
writer.close(); writer.close();
} }
@ -487,11 +491,15 @@ public class FileCache {
if (file.exists()) { if (file.exists()) {
if (file.isDirectory()) { if (file.isDirectory()) {
for (File f : file.listFiles()) for (File f : file.listFiles()) {
if (f.isDirectory()) if (f.isDirectory()) {
for (File a : f.listFiles()) for (File a : f.listFiles()) {
a.delete(); a.delete();
else f.delete(); }
f.delete();
} else f.delete();
}
file.delete();
} else file.delete(); } else file.delete();
} }
} }
@ -505,7 +513,7 @@ public class FileCache {
} catch (Error e) { } catch (Error e) {
path = player.getName(); path = player.getName();
} }
File file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + path); File file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + path + File.separator + "playerdatas.cache");
if (!file.exists()) { if (!file.exists()) {
file = new File("cache/" + player.getName().toLowerCase() + ".cache"); file = new File("cache/" + player.getName().toLowerCase() + ".cache");
} }

View File

@ -675,10 +675,7 @@ public class FlatFileThread extends Thread implements DataSource {
while ((br.readLine()) != null) { while ((br.readLine()) != null) {
result++; result++;
} }
} catch (FileNotFoundException ex) { } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return result;
} catch (IOException ex) {
ConsoleLogger.showError(ex.getMessage()); ConsoleLogger.showError(ex.getMessage());
return result; return result;
} finally { } finally {