Check FireTick during match load and start

core/src/main/java/tc/oc/pgm/gamerules/GameRulesMatchModule.java

@@ -10,6 +10,7 @@ public class GameRulesMatchModule implements MatchModule {
 
   private final Match match;
   private final Map<String, String> gameRules;
+  private boolean doDaylightCycle = false;
 
   public GameRulesMatchModule(Match match, Map<String, String> gameRules) {
     this.match = match;
@@ -20,10 +21,29 @@ public GameRulesMatchModule(Match match, Map<String, String> gameRules) {
   public void load() {
     for (Map.Entry<String, String> gameRule : this.gameRules.entrySet()) {
       this.match.getWorld().setGameRuleValue(gameRule.getKey(), gameRule.getValue());
+      if (gameRule.getKey().equals("doDaylightCycle")) {
+        doDaylightCycle = Boolean.parseBoolean(gameRule.getValue());
+      }
+    }
+
+    // gets gamerule values from level.dat after being set
+    // does not save doDaylightCycle to gamerules
+    for (String gameRule : this.match.getWorld().getGameRules()) {
+      if (!gameRule.equals("doDaylightCycle")) {
+        gameRules.put(gameRule, this.match.getWorld().getGameRuleValue(gameRule));
+      }
     }
   }
 
   public ImmutableMap<String, String> getGameRules() {
     return ImmutableMap.copyOf(gameRules);
   }
+
+  public String getGameRule(String gameRule) {
+    return gameRules.get(gameRule);
+  }
+
+  public boolean getDoDaylightCycle() {
+    return doDaylightCycle;
+  }
 }

core/src/main/java/tc/oc/pgm/listeners/PGMListener.java

@@ -60,6 +60,7 @@
 import tc.oc.pgm.util.text.TextTranslations;
 
 public class PGMListener implements Listener {
+  private static final String DO_FIRE_TICK = "doFireTick";
   private static final String DO_DAYLIGHT_CYCLE = "doDaylightCycle";
   /*
   1000  /time set day
@@ -258,6 +259,26 @@ public void handleItemPickup(final PlayerPickupItemEvent event) {
     if (nearestPlayer != event.getPlayer()) event.setCancelled(true);
   }
 
+  @EventHandler
+  public void lockFireTick(final MatchLoadEvent event) {
+    event.getMatch().getWorld().setGameRuleValue(DO_FIRE_TICK, Boolean.toString(false));
+  }
+
+  @EventHandler
+  public void unlockFireTick(final MatchStartEvent event) {
+    event
+        .getMatch()
+        .getWorld()
+        .setGameRuleValue(
+            DO_FIRE_TICK,
+            event.getMatch().needModule(GameRulesMatchModule.class).getGameRule(DO_FIRE_TICK));
+  }
+
+  @EventHandler
+  public void lockFireTick(final MatchFinishEvent event) {
+    event.getMatch().getWorld().setGameRuleValue(DO_FIRE_TICK, Boolean.toString(false));
+  }
+
   //
   // Time Lock
   // lock time before, during (if time lock enabled), and after the match
@@ -272,11 +293,11 @@ public void unlockTime(final MatchStartEvent event) {
     // if there is a timelock module and it is off, unlock time
     boolean unlockTime = !event.getMatch().getModule(WorldTimeModule.class).isTimeLocked();
 
-    GameRulesMatchModule gameRulesModule = event.getMatch().getModule(GameRulesMatchModule.class);
-    if (gameRulesModule != null && gameRulesModule.getGameRules().containsKey(DO_DAYLIGHT_CYCLE)) {
-      unlockTime = Boolean.parseBoolean(gameRulesModule.getGameRules().get(DO_DAYLIGHT_CYCLE));
+    GameRulesMatchModule gameRulesMatchModule =
+        event.getMatch().getModule(GameRulesMatchModule.class);
+    if (gameRulesMatchModule != null && gameRulesMatchModule.getDoDaylightCycle()) {
+      unlockTime = gameRulesMatchModule.getDoDaylightCycle();
     }
-
     event.getMatch().getWorld().setGameRuleValue(DO_DAYLIGHT_CYCLE, Boolean.toString(unlockTime));
   }