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

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

1 files changed, 15 insertions, 0 deletions

diff --git a/Minecraft.World/BaseEntityTile.h b/Minecraft.World/BaseEntityTile.h
new file mode 100644
index 00000000..5136bab8
--- /dev/null
+++ b/Minecraft.World/BaseEntityTile.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "Tile.h"
+#include "EntityTile.h"
+
+class TileEntity;
+
+class BaseEntityTile : public Tile, public EntityTile
+{
+protected:
+	BaseEntityTile(int id, Material *material, bool isSolidRender = true);
+public:
+	virtual void onPlace(Level *level, int x, int y, int z);
+	virtual void onRemove(Level *level, int x, int y, int z, int id, int data);
+	virtual bool triggerEvent(Level *level, int x, int y, int z, int b0, int b1);
+};
\ No newline at end of file