From a3b819cda33bdb2499b1e49748e80895696c7c14 Mon Sep 17 00:00:00 2001
From: DroppingAnvil <dr0pping.4nvi1@gmail.com>
Date: Tue, 17 Sep 2019 17:28:32 -0500
Subject: [PATCH] Fixed grace period issues!

---
 .../listeners/FactionsBlockListener.java        | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
index 9832f739..fd103e64 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
@@ -470,24 +470,18 @@ public class FactionsBlockListener implements Listener {
     //Grace
     @EventHandler
     public void onBreak(EntityExplodeEvent e) {
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-grace.Enabled"))
-            return;
+        if (!Conf.gracePeriod) return;
 
-        if (!graceisEnabled()) {
-            e.setCancelled(true);
-        }
+        e.setCancelled(true);
     }
 
     @EventHandler
     public void entityDamage(EntityDamageEvent e) {
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-grace.Enabled"))
-            return;
+        if (!Conf.gracePeriod) return;
 
-        if (!graceisEnabled()) {
             if (e.getEntity() instanceof Player) {
                 if (e.getCause() == EntityDamageEvent.DamageCause.PROJECTILE) {
                     e.setCancelled(true);
-                }
             }
         }
     }
@@ -495,10 +489,9 @@ public class FactionsBlockListener implements Listener {
     @EventHandler
     public void onTNTPlace(BlockPlaceEvent e1) {
         FPlayer fp = FPlayers.getInstance().getByPlayer(e1.getPlayer());
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-grace.Enabled"))
-            return;
+        if (!Conf.gracePeriod) return;
 
-        if (!graceisEnabled() && !fp.isAdminBypassing()) {
+        if (!fp.isAdminBypassing()) {
             if (e1.getBlock().getType().equals(Material.TNT)) {
                 e1.setCancelled(true);