From 337a0502bfc520cd73ceee6d1e8373870a6c0eca Mon Sep 17 00:00:00 2001 From: KleinCrafter Date: Thu, 28 Sep 2023 18:02:34 +0200 Subject: [PATCH] Fix #873 Use Bukkit API for plugin Directory --- src/main/java/de/diddiz/LogBlock/Consumer.java | 7 ++++--- src/main/java/de/diddiz/LogBlock/WorldEditor.java | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/diddiz/LogBlock/Consumer.java b/src/main/java/de/diddiz/LogBlock/Consumer.java index 67e1e2c..827b1c4 100644 --- a/src/main/java/de/diddiz/LogBlock/Consumer.java +++ b/src/main/java/de/diddiz/LogBlock/Consumer.java @@ -521,8 +521,9 @@ public class Consumer extends Thread { final long time = System.currentTimeMillis(); final Set insertedPlayers = new HashSet<>(); int counter = 0; - new File("plugins/LogBlock/import/").mkdirs(); - PrintWriter writer = new PrintWriter(new File("plugins/LogBlock/import/queue-" + time + "-0.sql")); + final File importDir = new File(logblock.getDataFolder(), "import"); + importDir.mkdirs(); + PrintWriter writer = new PrintWriter(new File(importDir, "queue-" + time + "-0.sql")); while (!isQueueEmpty()) { final Row r = pollQueueFirst(); if (r == null) { @@ -541,7 +542,7 @@ public class Consumer extends Thread { counter++; if (counter % 1000 == 0) { writer.close(); - writer = new PrintWriter(new File("plugins/LogBlock/import/queue-" + time + "-" + counter / 1000 + ".sql")); + writer = new PrintWriter(new File(importDir, "queue-" + time + "-" + counter / 1000 + ".sql")); } } writer.close(); diff --git a/src/main/java/de/diddiz/LogBlock/WorldEditor.java b/src/main/java/de/diddiz/LogBlock/WorldEditor.java index 251965c..0c58dd2 100644 --- a/src/main/java/de/diddiz/LogBlock/WorldEditor.java +++ b/src/main/java/de/diddiz/LogBlock/WorldEditor.java @@ -182,8 +182,9 @@ public class WorldEditor implements Runnable { logblock.getServer().getScheduler().cancelTask(taskID); if (errorList.size() > 0) { try { - final File file = new File("plugins/LogBlock/error/WorldEditor-" + new SimpleDateFormat("yy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()) + ".log"); - file.getParentFile().mkdirs(); + final File errorDir = new File(logblock.getDataFolder(), "error"); + errorDir.mkdir(); + final File file = new File(errorDir, "WorldEditor-" + new SimpleDateFormat("yy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()) + ".log"); final PrintWriter writer = new PrintWriter(file); for (final WorldEditorException err : errorList) { writer.println(BaseComponent.toPlainText(err.getLogMessage()));