diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsWrapper.java b/Essentials/src/com/earth2me/essentials/metrics/MetricsWrapper.java index b9b5afbdb..2babf3178 100644 --- a/Essentials/src/com/earth2me/essentials/metrics/MetricsWrapper.java +++ b/Essentials/src/com/earth2me/essentials/metrics/MetricsWrapper.java @@ -65,8 +65,13 @@ public class MetricsWrapper { metrics.addCustomChart(new Metrics.DrilldownPie("econPlugin", () -> { Map> result = new HashMap<>(); Map backend = new HashMap<>(); - backend.put(Methods.getMethod().getPlugin().getName(), 1); - result.put(Methods.getMethod().getName(), backend); + if (Methods.hasMethod()) { + backend.put(Methods.getMethod().getBackend(), 1); + result.put(Methods.getMethod().getName(), backend); + } else { + backend.put("Essentials", 1); + result.put("Essentials", backend); + } return result; })); } diff --git a/Essentials/src/com/earth2me/essentials/register/payment/Method.java b/Essentials/src/com/earth2me/essentials/register/payment/Method.java index 551ed17a9..daa90c109 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/Method.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/Method.java @@ -33,6 +33,13 @@ public interface Method { */ String getName(); + /** + * Returns the backend plugin of this economy method, if applicable. + * + * @return String Plugin name. + */ + String getBackend(); + /** * Returns the reported name of this method. * diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java index ae1586053..20c5dc1a2 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java @@ -29,13 +29,14 @@ public class VaultEco implements Method { return this.vault.getDescription().getName(); } - public String getEconomy() { + @Override + public String getBackend() { return economy == null ? "NoEco" : economy.getName(); } @Override public String getLongName() { - return getName().concat(" - Economy: ").concat(getEconomy()); + return getName().concat(" - Economy: ").concat(getBackend()); } @Override