From 51e4b10437ee6a6ae3a1178223258f9c82b78638 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 25 Aug 2020 12:59:15 -0400 Subject: [PATCH] Fire rule --- core/src/mindustry/entities/Fires.java | 2 +- core/src/mindustry/game/Rules.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/Fires.java b/core/src/mindustry/entities/Fires.java index e24d34dac4..2906b4e7d7 100644 --- a/core/src/mindustry/entities/Fires.java +++ b/core/src/mindustry/entities/Fires.java @@ -17,7 +17,7 @@ public class Fires{ /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */ public static void create(Tile tile){ - if(net.client() || tile == null) return; //not clientside. + if(net.client() || tile == null || !state.rules.fire) return; //not clientside. Fire fire = map.get(tile.pos()); diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index b29aa0c0e1..2b0c2bac28 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -40,6 +40,8 @@ public class Rules{ public boolean reactorExplosions = true; /** Whether friendly explosions can occur and set fire/damage other blocks. */ public boolean damageExplosions = true; + /** Whether fire is enabled. */ + public boolean fire = true; /** Whether units use and require ammo. */ public boolean unitAmmo = false; /** How fast unit pads build units. */