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

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

1 files changed, 6 insertions, 5 deletions

diff --git a/Minecraft.World/LiquidTileDynamic.h b/Minecraft.World/LiquidTileDynamic.h
index 51bbf181..bf0c9a6d 100644
--- a/Minecraft.World/LiquidTileDynamic.h
+++ b/Minecraft.World/LiquidTileDynamic.h
@@ -25,7 +25,7 @@ protected:
 	virtual ~LiquidTileDynamic();
 private:
 	void setStatic(Level *level, int x, int y, int z);
-    int maxCount;
+	int maxCount;
 public:
 	virtual bool isPathfindable(LevelSource *level, int x, int y, int z);
 
@@ -38,17 +38,18 @@ public:
 private:
 	void trySpreadTo(Level *level, int x, int y, int z, int neighbor);
 
-    bool *result;
-    int *dist;
+	bool *result;
+	int *dist;
 
 private:
 	int getSlopeDistance(Level *level, int x, int y, int z, int pass, int from);
-    bool *getSpread(Level *level, int x, int y, int z);
-    bool isWaterBlocking(Level *level, int x, int y, int z);
+	bool *getSpread(Level *level, int x, int y, int z);
+	bool isWaterBlocking(Level *level, int x, int y, int z);
 protected:
 	int getHighest(Level *level, int x, int y, int z, int current);
 private:
 	bool canSpreadTo(Level *level, int x, int y, int z);
 public:
 	void onPlace(Level *level, int x, int y, int z);
+	bool canInstantlyTick();
 };
\ No newline at end of file