diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/events/DeniedMessageEvent.java b/src/main/java/me/ryanhamshire/GriefPrevention/events/DeniedMessageEvent.java deleted file mode 100644 index 305e37f..0000000 --- a/src/main/java/me/ryanhamshire/GriefPrevention/events/DeniedMessageEvent.java +++ /dev/null @@ -1,55 +0,0 @@ -package me.ryanhamshire.GriefPrevention.events; - -import me.ryanhamshire.GriefPrevention.Messages; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -import javax.annotation.Nonnull; - -/** - * Called when GP is retrieving the denial message to send to the player when canceling an action - * - * @author RoboMWM - * Created 1/4/2017. - */ -public class DeniedMessageEvent extends Event -{ - // Custom Event Requirements - private static final HandlerList handlers = new HandlerList(); - public static HandlerList getHandlerList() { - return handlers; - } - @Override - public HandlerList getHandlers() { - return handlers; - } - - private String message; - private Messages messageID; - - public DeniedMessageEvent(Messages messageID, String message) - { - this.message = message; - this.messageID = messageID; - } - - public Messages getMessageID() - { - return this.messageID; - } - - public String getMessage() - { - return this.message; - } - - /** - * Sets the message to print to the player. - * @param message Cannot be null. Set to an empty string if you wish for no message to be printed. - */ - public void setMessage(@Nonnull String message) - { - this.message = message; - } - -} diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/metrics/MetricsHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/metrics/MetricsHandler.java index 20e9902..90a3d6b 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/metrics/MetricsHandler.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/metrics/MetricsHandler.java @@ -27,13 +27,15 @@ public class MetricsHandler //enums and etc. would be amazing. + addSimplePie("lock_death_drops_pvp", plugin.config_lockDeathDropsInPvpWorlds); + addSimplePie("lock_death_drops_nonpvp", plugin.config_lockDeathDropsInNonPvpWorlds); + //PvP - only send PvP configs for those who use them boolean pvpApplies = false; for (World world : plugin.getServer().getWorlds()) { if (plugin.pvpRulesApply(world)) { - addSimplePie("lock_death_drops", plugin.config_lockDeathDropsInNonPvpWorlds || plugin.config_lockDeathDropsInPvpWorlds); addSimplePie("no_pvp_in_player_claims", plugin.config_pvp_noCombatInPlayerLandClaims); addSimplePie("protect_pets_pvp", plugin.config_pvp_protectPets); addSimplePie("protect_fresh_spawns_pvp", plugin.config_pvp_protectFreshSpawns);