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

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

1 files changed, 44 insertions, 33 deletions

diff --git a/Minecraft.Client/FallingTileRenderer.cpp b/Minecraft.Client/FallingTileRenderer.cpp
index 02e23dad..2d9f5dae 100644
--- a/Minecraft.Client/FallingTileRenderer.cpp
+++ b/Minecraft.Client/FallingTileRenderer.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "FallingTileRenderer.h"
+#include "TextureAtlas.h"
 #include "TileRenderer.h"
 #include "..\Minecraft.World\net.minecraft.world.entity.item.h"
 #include "..\Minecraft.World\net.minecraft.world.level.h"
@@ -16,41 +17,51 @@ void FallingTileRenderer::render(shared_ptr<Entity> _tile, double x, double y, d
 {
 	// 4J - dynamic cast required because we aren't using templates/generics in our version
 	shared_ptr<FallingTile> tile = dynamic_pointer_cast<FallingTile>(_tile);
-	glPushMatrix();
-	glTranslatef((float) x, (float) y, (float) z);
-
-	bindTexture(TN_TERRAIN);	// 4J was L"/terrain.png"
-	Tile *tt = Tile::tiles[tile->tile];
-
 	Level *level = tile->getLevel();
 
-	glDisable(GL_LIGHTING);
-	glColor4f(1, 1, 1, 1);	// 4J added - this wouldn't be needed in real opengl as the block render has vertex colours and so this isn't use, but our pretend gl always modulates with this
-	if (tt == Tile::anvil && tt->getRenderShape() == Tile::SHAPE_ANVIL)
-	{
-		tileRenderer->level = level;
-		Tesselator *t = Tesselator::getInstance();
-		t->begin();
-		t->offset(-Mth::floor(tile->x) - 0.5f, -Mth::floor(tile->y) - 0.5f, -Mth::floor(tile->z) - 0.5f);
-		tileRenderer->tesselateAnvilInWorld((AnvilTile *) tt, Mth::floor(tile->x), Mth::floor(tile->y), Mth::floor(tile->z), tile->data);
-		t->offset(0, 0, 0);
-		t->end();
-	}
-	else if (tt == Tile::dragonEgg)
-	{
-		tileRenderer->level = level;
-		Tesselator *t = Tesselator::getInstance();
-		t->begin();
-		t->offset(-Mth::floor(tile->x) - 0.5f, -Mth::floor(tile->y) - 0.5f, -Mth::floor(tile->z) - 0.5f);
-		tileRenderer->tesselateInWorld(tt, Mth::floor(tile->x), Mth::floor(tile->y), Mth::floor(tile->z));
-		t->offset(0, 0, 0);
-		t->end();
-	}
-	else if( tt != NULL )
+    if (level->getTile(floor(tile->x), floor(tile->y), floor(tile->z)) != tile->tile)
 	{
-		tileRenderer->setShape(tt);
-		tileRenderer->renderBlock(tt, level, Mth::floor(tile->x), Mth::floor(tile->y), Mth::floor(tile->z), tile->data);
+		glPushMatrix();
+		glTranslatef((float) x, (float) y, (float) z);
+
+		bindTexture(tile);	// 4J was L"/terrain.png"
+		Tile *tt = Tile::tiles[tile->tile];
+
+		Level *level = tile->getLevel();
+
+		glDisable(GL_LIGHTING);
+		glColor4f(1, 1, 1, 1);	// 4J added - this wouldn't be needed in real opengl as the block render has vertex colours and so this isn't use, but our pretend gl always modulates with this
+		if (tt == Tile::anvil && tt->getRenderShape() == Tile::SHAPE_ANVIL)
+		{
+			tileRenderer->level = level;
+			Tesselator *t = Tesselator::getInstance();
+			t->begin();
+			t->offset(-Mth::floor(tile->x) - 0.5f, -Mth::floor(tile->y) - 0.5f, -Mth::floor(tile->z) - 0.5f);
+			tileRenderer->tesselateAnvilInWorld((AnvilTile *) tt, Mth::floor(tile->x), Mth::floor(tile->y), Mth::floor(tile->z), tile->data);
+			t->offset(0, 0, 0);
+			t->end();
+		}
+		else if (tt == Tile::dragonEgg)
+		{
+			tileRenderer->level = level;
+			Tesselator *t = Tesselator::getInstance();
+			t->begin();
+			t->offset(-Mth::floor(tile->x) - 0.5f, -Mth::floor(tile->y) - 0.5f, -Mth::floor(tile->z) - 0.5f);
+			tileRenderer->tesselateInWorld(tt, Mth::floor(tile->x), Mth::floor(tile->y), Mth::floor(tile->z));
+			t->offset(0, 0, 0);
+			t->end();
+		}
+		else if( tt != NULL )
+		{
+			tileRenderer->setShape(tt);
+			tileRenderer->renderBlock(tt, level, Mth::floor(tile->x), Mth::floor(tile->y), Mth::floor(tile->z), tile->data);
+		}
+		glEnable(GL_LIGHTING);
+		glPopMatrix();
 	}
-	glEnable(GL_LIGHTING);
-	glPopMatrix();
+}
+
+ResourceLocation *FallingTileRenderer::getTextureLocation(shared_ptr<Entity> mob)
+{
+    return &TextureAtlas::LOCATION_BLOCKS;
 }
\ No newline at end of file