From b3c91d866b39ac74c5dfb3c0c328ae2b52503407 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Sun, 16 Feb 2020 14:41:51 +0100 Subject: [PATCH] Lazy cherry-pick 5db1e73eae4b0d4628df8bbbc172670c42d96435 without merge conflics --- .../intellectualsites/plotsquared/bukkit/BukkitMain.java | 1 - .../intellectualsites/plotsquared/plot/config/Settings.java | 3 --- 2 files changed, 4 deletions(-) diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java index 2304f4a96..f28bc3c97 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java @@ -689,7 +689,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain } this.metricsStarted = true; Metrics metrics = new Metrics(this, BSTATS_ID);// bstats - PlotSquared.log(Captions.PREFIX + "&6Metrics enabled."); } @Override public ChunkManager initChunkManager() { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java index 8e1f5ef5b..ba28d80be 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java @@ -166,7 +166,6 @@ public class Settings extends Config { Chat.CONSOLE_COLOR = config.getBoolean("console.color", Chat.CONSOLE_COLOR); Chat.INTERACTIVE = config.getBoolean("chat.fancy", Chat.INTERACTIVE); - Enabled_Components.METRICS = config.getBoolean("metrics", Enabled_Components.METRICS); Enabled_Components.UPDATER = config.getBoolean("update-notifications", Enabled_Components.UPDATER); Enabled_Components.DATABASE_PURGER = @@ -340,8 +339,6 @@ public class Settings extends Config { @Comment("Allow WorldEdit to be restricted to plots") public static boolean WORLDEDIT_RESTRICTIONS = true; @Comment("Allow economy to be used") public static boolean ECONOMY = true; - @Comment("@deprecated - use bstats config.yml") public static boolean - METRICS = true; @Comment("Expiry will clear old or simplistic plots") public static boolean PLOT_EXPIRY = false; @Comment("Processes chunks (trimming, or entity/tile limits) ") public static boolean