From b7e5828c3fc6d59d2b520b556d68d9a14fef2095 Mon Sep 17 00:00:00 2001 From: sk89q Date: Fri, 19 Nov 2010 20:34:38 -0800 Subject: [PATCH] WorldGuard should now close loggers on disable and reload. --- src/WorldGuard.java | 1 + src/WorldGuardListener.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/WorldGuard.java b/src/WorldGuard.java index daf2a721..aaa72ef7 100644 --- a/src/WorldGuard.java +++ b/src/WorldGuard.java @@ -90,6 +90,7 @@ public void enable() { @Override public void disable() { try { + listener.disable(); BlacklistEntry.forgetAllPlayers(); } catch (Throwable t) { } diff --git a/src/WorldGuardListener.java b/src/WorldGuardListener.java index 00e32eec..2c0b676b 100644 --- a/src/WorldGuardListener.java +++ b/src/WorldGuardListener.java @@ -154,6 +154,11 @@ public void loadConfiguration() { // Load the blacklist try { + // If there was an existing blacklist, close loggers + if (blacklist != null) { + blacklist.getLogger().close(); + } + // First load the blacklist data from worldguard-blacklist.txt Blacklist blacklist = new Blacklist(); blacklist.load(new File("worldguard-blacklist.txt")); @@ -636,4 +641,13 @@ public boolean canDestroyBlock(Player player, Block block) { plugin.toggleEnabled(); } } + + /** + * Call to disable the plugin. + */ + public void disable() { + if (blacklist != null) { + blacklist.getLogger().close(); + } + } } \ No newline at end of file