From 0310f0f827798b05abdfabd41a3897cbc8163e6a Mon Sep 17 00:00:00 2001 From: Etzelia Date: Fri, 16 Jul 2021 22:11:54 -0500 Subject: [PATCH] Check for configurable grief types Signed-off-by: Etzelia --- pom.xml | 6 +++--- .../listeners/GriefAlertListener.java | 21 ++++++++++++++----- src/main/resources/config.yml | 5 +++++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 03e5232..94b14e2 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ xyz.etztech plugin-api - 1.0.8 + 1.0.7 @@ -57,8 +57,8 @@ https://hub.spigotmc.org/nexus/content/groups/public/ - etztech-repo - https://repo.etztech.xyz/ + canopy-repo + https://mvn.canopymc.net/ mvn-repo diff --git a/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java b/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java index b1826e3..e46099f 100644 --- a/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java +++ b/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java @@ -117,23 +117,34 @@ public class GriefAlertListener implements Listener { @EventHandler public void onBlockIgnite(BlockIgniteEvent event) { - if (event.getPlayer() != null && - (event.getCause() == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL || - event.getCause() == BlockIgniteEvent.IgniteCause.FIREBALL)) { + if ( + event.getPlayer() != null && + this.plugin.getConfig().getStringList("grief.enabled").contains("ignition") && + ( + event.getCause() == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL || + event.getCause() == BlockIgniteEvent.IgniteCause.FIREBALL + ) + ) { addAlert(event.getPlayer(), event.getBlock().getLocation(), Lang.IGNITE_ALERT); } } @EventHandler public void onBlockPlace(BlockPlaceEvent event) { - if(event.getBlockPlaced().getType() == Material.TNT) { + if( + this.plugin.getConfig().getStringList("grief.enabled").contains("tnt") && + event.getBlockPlaced().getType() == Material.TNT + ) { addAlert(event.getPlayer(), event.getBlock().getLocation(), Lang.TNT_ALERT); } } @EventHandler public void onBucketEmpty(PlayerBucketEmptyEvent event) { - if(event.getBucket() == Material.LAVA_BUCKET) { + if( + this.plugin.getConfig().getStringList("grief.enabled").contains("lava") && + event.getBucket() == Material.LAVA_BUCKET + ) { addAlert(event.getPlayer(), event.getBlock().getLocation(), Lang.LAVA_ALERT); } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 1eb4acb..ca4d724 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -21,6 +21,11 @@ grief: below_y: 255 # y level lower limit above_y: 20 + # enabled alert types (ignition, tnt, or lava) + enabled: + - ignition + - tnt + - lava # OreAlert ore: