From 0adee3582b40446e5b4bc5c44a9372a6becc7bd5 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sun, 8 Nov 2020 21:08:44 -0600
Subject: [PATCH] d

---
 .../totalfreedommod/GameRuleHandler.java            | 13 +++----------
 .../totalfreedommod/blocking/EventBlocker.java      |  4 +++-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java b/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
index 147abf30..955dae5b 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
@@ -10,7 +10,6 @@ import org.bukkit.World;
 
 public class GameRuleHandler extends FreedomService
 {
-
     private final Map<GameRule, Boolean> rules = new EnumMap<>(GameRule.class);
 
     public GameRuleHandler()
@@ -61,11 +60,8 @@ public class GameRuleHandler extends FreedomService
     public void commitGameRules()
     {
         List<World> worlds = Bukkit.getWorlds();
-        Iterator<Map.Entry<GameRule, Boolean>> it = rules.entrySet().iterator();
-        while (it.hasNext())
+        for (Map.Entry<GameRule, Boolean> gameRuleEntry : rules.entrySet())
         {
-
-            Map.Entry<GameRule, Boolean> gameRuleEntry = it.next();
             String gameRuleName = gameRuleEntry.getKey().getGameRuleName();
             String gameRuleValue = gameRuleEntry.getValue().toString();
 
@@ -79,13 +75,11 @@ public class GameRuleHandler extends FreedomService
                     world.setTime(time + 24000 + 6000);
                 }
             }
-
         }
     }
 
-    public static enum GameRule
+    public enum GameRule
     {
-
         DO_FIRE_TICK("doFireTick", true),
         MOB_GRIEFING("mobGriefing", true),
         KEEP_INVENTORY("keepInventory", false),
@@ -98,7 +92,7 @@ public class GameRuleHandler extends FreedomService
         ANNOUNCE_ADVANCEMENTS("announceAdvancements", false),
         SHOW_DEATH_MESSAGES("showDeathMessages", false),
         SEND_COMMAND_FEEDBACK("sendCommandFeedback", false);
-        //
+
         private final String gameRuleName;
         private final boolean defaultValue;
 
@@ -118,5 +112,4 @@ public class GameRuleHandler extends FreedomService
             return defaultValue;
         }
     }
-
 }
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
index 0e774701..b0d8e2c4 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
@@ -214,13 +214,14 @@ public class EventBlocker extends FreedomService
 
     // TODO: Revert back to old redstone block system when (or if) it is fixed in Bukkit, Spigot or Paper.
     private ArrayList<Material> redstoneBlocks = new ArrayList<>(Arrays.asList(Material.REDSTONE, Material.DISPENSER, Material.DROPPER, Material.REDSTONE_LAMP));
+
     @EventHandler
     public void onBlockPhysics(BlockPhysicsEvent event)
     {
         if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
         {
             // Check if the block is involved with redstone.
-            if(event.getBlock().getBlockData() instanceof AnaloguePowerable || event.getBlock().getBlockData() instanceof Powerable || redstoneBlocks.contains(event.getBlock().getType()))
+            if (event.getBlock().getBlockData() instanceof AnaloguePowerable || event.getBlock().getBlockData() instanceof Powerable || redstoneBlocks.contains(event.getBlock().getType()))
             {
                 event.setCancelled(true);
             }
@@ -239,6 +240,7 @@ public class EventBlocker extends FreedomService
             }
         }
     }
+
     @EventHandler(priority = EventPriority.NORMAL)
     public void onBlockDispense(BlockDispenseEvent event)
     {