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

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

1 files changed, 22 insertions, 22 deletions

diff --git a/Minecraft.World/HellPortalFeature.cpp b/Minecraft.World/HellPortalFeature.cpp
index 7a918e2c..66485578 100644
--- a/Minecraft.World/HellPortalFeature.cpp
+++ b/Minecraft.World/HellPortalFeature.cpp
@@ -5,33 +5,33 @@
 
 bool HellPortalFeature::place(Level *level, Random *random, int x, int y, int z)
 {
-    if (!level->isEmptyTile(x, y, z)) return false;
-    if (level->getTile(x, y + 1, z) != Tile::hellRock_Id) return false;
-    level->setTile(x, y, z, Tile::lightGem_Id);
+	if (!level->isEmptyTile(x, y, z)) return false;
+	if (level->getTile(x, y + 1, z) != Tile::netherRack_Id) return false;
+	level->setTileAndData(x, y, z, Tile::glowstone_Id, 0, Tile::UPDATE_CLIENTS);
 
-    for (int i = 0; i < 1500; i++)
+	for (int i = 0; i < 1500; i++)
 	{
-        int x2 = x + random->nextInt(8) - random->nextInt(8);
-        int y2 = y - random->nextInt(12);
-        int z2 = z + random->nextInt(8) - random->nextInt(8);
-        if (level->getTile(x2, y2, z2) != 0) continue;
+		int x2 = x + random->nextInt(8) - random->nextInt(8);
+		int y2 = y - random->nextInt(12);
+		int z2 = z + random->nextInt(8) - random->nextInt(8);
+		if (level->getTile(x2, y2, z2) != 0) continue;
 
-        int count = 0;
-        for (int t = 0; t < 6; t++)
+		int count = 0;
+		for (int t = 0; t < 6; t++)
 		{
-            int tile = 0;
-            if (t == 0) tile = level->getTile(x2 - 1, y2, z2);
-            if (t == 1) tile = level->getTile(x2 + 1, y2, z2);
-            if (t == 2) tile = level->getTile(x2, y2 - 1, z2);
-            if (t == 3) tile = level->getTile(x2, y2 + 1, z2);
-            if (t == 4) tile = level->getTile(x2, y2, z2 - 1);
-            if (t == 5) tile = level->getTile(x2, y2, z2 + 1);
+			int tile = 0;
+			if (t == 0) tile = level->getTile(x2 - 1, y2, z2);
+			if (t == 1) tile = level->getTile(x2 + 1, y2, z2);
+			if (t == 2) tile = level->getTile(x2, y2 - 1, z2);
+			if (t == 3) tile = level->getTile(x2, y2 + 1, z2);
+			if (t == 4) tile = level->getTile(x2, y2, z2 - 1);
+			if (t == 5) tile = level->getTile(x2, y2, z2 + 1);
 
-            if (tile == Tile::lightGem_Id) count++;
-        }
+			if (tile == Tile::glowstone_Id) count++;
+		}
 
-        if (count == 1) level->setTile(x2, y2, z2, Tile::lightGem_Id);
-    }
+		if (count == 1) level->setTileAndData(x2, y2, z2, Tile::glowstone_Id, 0, Tile::UPDATE_CLIENTS);
+	}
 
-    return true;
+	return true;
 }
\ No newline at end of file