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

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

1 files changed, 21 insertions, 0 deletions

diff --git a/Minecraft.World/SoulSandTile.cpp b/Minecraft.World/SoulSandTile.cpp
new file mode 100644
index 00000000..4ebcf5f6
--- /dev/null
+++ b/Minecraft.World/SoulSandTile.cpp
@@ -0,0 +1,21 @@
+#include "stdafx.h"
+#include "net.minecraft.world.entity.h"
+#include "net.minecraft.world.phys.h"
+#include "SoulSandTile.h"
+
+
+SoulSandTile::SoulSandTile(int id) : Tile(id, Material::sand)
+{
+}
+
+AABB *SoulSandTile::getAABB(Level *level, int x, int y, int z)
+{
+    float r = 2 / 16.0f;
+    return AABB::newTemp(x, y, z, x + 1, y + 1 - r, z + 1);
+}
+
+void SoulSandTile::entityInside(Level *level, int x, int y, int z, shared_ptr<Entity> entity)
+{
+    entity->xd*=0.4;
+    entity->zd*=0.4;
+}
\ No newline at end of file