From 70c6b26db5d7a0c0bbb96eb148979987dcb50370 Mon Sep 17 00:00:00 2001 From: sk89q Date: Fri, 19 Nov 2010 20:09:26 -0800 Subject: [PATCH] Added summary-on-start configuration setting to control whether the summary should be printed. --- CHANGELOG.txt | 2 ++ src/WorldGuardListener.java | 32 +++++++++++++++++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6880b441..737a6aa6 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,6 @@ 1.2 +- A new summary of the status of some core protections is now printed + on start. Disable this with 'summary-on-start'. - Blacklist system has been overhauled. Check README.txt for changed configuration settings! - The blacklist's method of preventing notification repeats is now better, diff --git a/src/WorldGuardListener.java b/src/WorldGuardListener.java index 0d2bd4ff..9f198134 100644 --- a/src/WorldGuardListener.java +++ b/src/WorldGuardListener.java @@ -190,22 +190,24 @@ public void loadConfiguration() { } // Print an overview of settings - logger.log(Level.INFO, enforceOneSession ? "WorldGuard: Single session is enforced." - : "WorldGuard: Single session is NOT ENFORCED."); - logger.log(Level.INFO, blockTNT ? "WorldGuard: TNT ignition is blocked." - : "WorldGuard: TNT ignition is PERMITTED."); - logger.log(Level.INFO, blockLighter ? "WorldGuard: Lighters are blocked." - : "WorldGuard: Lighters are PERMITTED."); - logger.log(Level.INFO, preventLavaFire ? "WorldGuard: Lava fire is blocked." - : "WorldGuard: Lava fire is PERMITTED."); - if (disableAllFire) { - logger.log(Level.INFO, "WorldGuard: All fire spread is disabled."); - } else { - if (fireNoSpreadBlocks != null) { - logger.log(Level.INFO, "WorldGuard: Fire spread is limited to " - + fireNoSpreadBlocks.size() + " block types."); + if (properties.getBoolean("summary-on-start", true)) { + logger.log(Level.INFO, enforceOneSession ? "WorldGuard: Single session is enforced." + : "WorldGuard: Single session is NOT ENFORCED."); + logger.log(Level.INFO, blockTNT ? "WorldGuard: TNT ignition is blocked." + : "WorldGuard: TNT ignition is PERMITTED."); + logger.log(Level.INFO, blockLighter ? "WorldGuard: Lighters are blocked." + : "WorldGuard: Lighters are PERMITTED."); + logger.log(Level.INFO, preventLavaFire ? "WorldGuard: Lava fire is blocked." + : "WorldGuard: Lava fire is PERMITTED."); + if (disableAllFire) { + logger.log(Level.INFO, "WorldGuard: All fire spread is disabled."); } else { - logger.log(Level.INFO, "WorldGuard: Fire spread is UNRESTRICTED."); + if (fireNoSpreadBlocks != null) { + logger.log(Level.INFO, "WorldGuard: Fire spread is limited to " + + fireNoSpreadBlocks.size() + " block types."); + } else { + logger.log(Level.INFO, "WorldGuard: Fire spread is UNRESTRICTED."); + } } } }