Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 22 insertions, 20 deletions

diff --git a/Minecraft.World/FireTile.h b/Minecraft.World/FireTile.h
index af079a6a..1d823752 100644
--- a/Minecraft.World/FireTile.h
+++ b/Minecraft.World/FireTile.h
@@ -13,19 +13,19 @@ public:
 	static const wstring TEXTURE_SECOND;
 
 	static const int FLAME_INSTANT = 60;
-    static const int FLAME_EASY = 30;
-    static const int FLAME_MEDIUM = 15;
-    static const int FLAME_HARD = 5;
-		
-    static const int BURN_INSTANT = 100;
-    static const int BURN_EASY = 60;
-    static const int BURN_MEDIUM = 20;
-    static const int BURN_HARD = 5;
-    static const int BURN_NEVER = 0;
+	static const int FLAME_EASY = 30;
+	static const int FLAME_MEDIUM = 15;
+	static const int FLAME_HARD = 5;
+
+	static const int BURN_INSTANT = 100;
+	static const int BURN_EASY = 60;
+	static const int BURN_MEDIUM = 20;
+	static const int BURN_HARD = 5;
+	static const int BURN_NEVER = 0;
 
 private:
-    int *flameOdds;
-    int *burnOdds;
+	int *flameOdds;
+	int *burnOdds;
 	Icon **icons;
 protected:
 	FireTile(int id);
@@ -36,17 +36,19 @@ private:
 	void setFlammable(int id, int flame, int burn);
 public:
 	virtual AABB *getAABB(Level *level, int x, int y, int z);
-    virtual bool blocksLight();
-    virtual bool isSolidRender(bool isServerLevel = false);
-    virtual bool isCubeShaped();
-    virtual int getRenderShape();
-    virtual int getResourceCount(Random *random);
-    virtual int getTickDelay();
-    virtual void tick(Level *level, int x, int y, int z, Random *random);
+	virtual bool blocksLight();
+	virtual bool isSolidRender(bool isServerLevel = false);
+	virtual bool isCubeShaped();
+	virtual int getRenderShape();
+	virtual int getResourceCount(Random *random);
+	virtual int getTickDelay(Level *level);
+	virtual void tick(Level *level, int x, int y, int z, Random *random);
+	virtual bool canInstantlyTick();
+
 private:
 	void checkBurnOut(Level *level, int x, int y, int z, int chance, Random *random, int age);
-    bool isValidFireLocation(Level *level, int x, int y, int z);
-    int getFireOdds(Level *level, int x, int y, int z);
+	bool isValidFireLocation(Level *level, int x, int y, int z);
+	int getFireOdds(Level *level, int x, int y, int z);
 public:
 	virtual bool mayPick();
 	bool canBurn(LevelSource *level, int x, int y, int z);