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

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

1 files changed, 6 insertions, 0 deletions

diff --git a/Minecraft.Client/EntityTileRenderer.cpp b/Minecraft.Client/EntityTileRenderer.cpp
index a2301d42..deed369e 100644
--- a/Minecraft.Client/EntityTileRenderer.cpp
+++ b/Minecraft.Client/EntityTileRenderer.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "EntityTileRenderer.h"
 #include "TileEntityRenderDispatcher.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 #include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 
 EntityTileRenderer *EntityTileRenderer::instance = new EntityTileRenderer;
@@ -8,6 +9,7 @@ EntityTileRenderer *EntityTileRenderer::instance = new EntityTileRenderer;
 EntityTileRenderer::EntityTileRenderer()
 {
 	chest = shared_ptr<ChestTileEntity>(new ChestTileEntity());
+	trappedChest = shared_ptr<ChestTileEntity>(new ChestTileEntity(ChestTile::TYPE_TRAP));
 	enderChest = shared_ptr<EnderChestTileEntity>(new EnderChestTileEntity());
 }
 
@@ -17,6 +19,10 @@ void EntityTileRenderer::render(Tile *tile, int data, float brightness, float al
 	{
 		TileEntityRenderDispatcher::instance->render(enderChest, 0, 0, 0, 0, setColor, alpha, useCompiled);
 	}
+	else if (tile->id == Tile::chest_trap_Id)
+	{
+		TileEntityRenderDispatcher::instance->render(trappedChest, 0, 0, 0, 0, setColor, alpha, useCompiled);
+	}
 	else
 	{
 		TileEntityRenderDispatcher::instance->render(chest, 0, 0, 0, 0, setColor, alpha, useCompiled);