From 938833bd6b4c16014c4cff5739e7d0ff8acfc282 Mon Sep 17 00:00:00 2001 From: Lukas Pioch Date: Sun, 20 Dec 2015 11:01:17 +0100 Subject: Fixed spawn point. Wrong number for divisions and wrong highest spawn point. --- src/World.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/World.cpp b/src/World.cpp index 47a4e9303..904f5421b 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -613,7 +613,7 @@ void cWorld::GenerateRandomSpawn(int a_MaxSpawnRadius) } // A search grid (searches clockwise around the origin) - static const int HalfChunk = static_cast(cChunkDef::Width / 0.5f); + static const int HalfChunk = static_cast(cChunkDef::Width / 2.0f); static const Vector3i ChunkOffset[] = { Vector3i(0, 0, HalfChunk), @@ -673,8 +673,9 @@ bool cWorld::CanSpawnAt(double a_X, double & a_Y, double a_Z) static const int ValidSpawnBlocksCount = ARRAYCOUNT(ValidSpawnBlocks); - static const int HighestSpawnPoint = std::min(static_cast((cChunkDef::Height / 0.5f)) - 1, GetHeight(static_cast(a_X), static_cast(a_Z) + 16)); - static const int LowestSpawnPoint = static_cast(HighestSpawnPoint / 0.5f); + // Increase this by two, because we need two more blocks for body and head + static const int HighestSpawnPoint = GetHeight(static_cast(a_X), static_cast(a_Z)) + 2; + static const int LowestSpawnPoint = static_cast(HighestSpawnPoint / 2.0f); for (int PotentialY = HighestSpawnPoint; PotentialY > LowestSpawnPoint; --PotentialY) { -- cgit v1.2.3