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

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

1 files changed, 9 insertions, 9 deletions

diff --git a/Minecraft.World/EggTile.h b/Minecraft.World/EggTile.h
index c8929cbe..354a4436 100644
--- a/Minecraft.World/EggTile.h
+++ b/Minecraft.World/EggTile.h
@@ -5,23 +5,23 @@ class EggTile : public Tile
 {
 public:
 	EggTile(int id);
-    virtual void onPlace(Level *level, int x, int y, int z);
-    virtual void neighborChanged(Level *level, int x, int y, int z, int type);
-    virtual void tick(Level *level, int x, int y, int z, Random *random);
+	virtual void onPlace(Level *level, int x, int y, int z);
+	virtual void neighborChanged(Level *level, int x, int y, int z, int type);
+	virtual void tick(Level *level, int x, int y, int z, Random *random);
 private:
 	void checkSlide(Level *level, int x, int y, int z);
 public:
 	virtual bool use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly = false); // 4J added soundOnly param
-    virtual void attack(Level *level, int x, int y, int z, shared_ptr<Player> player);
+	virtual void attack(Level *level, int x, int y, int z, shared_ptr<Player> player);
 private:
 	void teleport(Level *level, int x, int y, int z);
 public:
-	virtual int getTickDelay();
-    virtual bool blocksLight();
-    virtual bool isSolidRender(bool isServerLevel = false);
-    virtual bool isCubeShaped();
+	virtual int getTickDelay(Level *level);
+	virtual bool blocksLight();
+	virtual bool isSolidRender(bool isServerLevel = false);
+	virtual bool isCubeShaped();
 	virtual bool shouldRenderFace(LevelSource *level, int x, int y, int z, int face);
-    virtual int getRenderShape();
+	virtual int getRenderShape();
 	virtual int cloneTileId(Level *level, int x, int y, int z);
 
 	// 4J Added