Unarelith/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ServerCommandHandler] Spawn area is 16x16 chunks instead of a single chunk.

Browse Source
This commit is contained in:
Quentin Bazin 2020-07-31 17:24:02 +02:00
parent d65d2117a9
commit 36bcbf2aee
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
source/server/network/ServerCommandHandler.cpp
View File

@ -192,48 +192,48 @@ void ServerCommandHandler::setupCallbacks() {
return;
}
// FIXME: Spawn chunk hardcoded here
s32 spawnChunkX = 1;
s32 spawnChunkY = 1;
if (player->isNewPlayer()) {
// FIXME: Default dimension hardcoded here
ServerWorld &world = m_worldController.getWorld(0);
Heightmap &heightmap = world.heightmap();
bool hasFoundPosition = false;
for(int y = 0 ; y < CHUNK_DEPTH ; y++) {
for(int x = 0 ; x < CHUNK_WIDTH ; x++) {
int maxChunkZ = heightmap.getHighestChunkAt(x + spawnChunkX * CHUNK_WIDTH, y + spawnChunkY * CHUNK_DEPTH);
int worldZ = heightmap.getHighestBlockAt(x + spawnChunkX * CHUNK_WIDTH, y + spawnChunkY * CHUNK_DEPTH) + 1;
int z = gk::pmod(worldZ, CHUNK_WIDTH);
for (s32 spawnChunkX = 0 ; spawnChunkX < 16 ; ++spawnChunkX) {
for (s32 spawnChunkY = 0 ; spawnChunkY < 16 ; ++spawnChunkY) {
for(int y = 0 ; y < CHUNK_DEPTH ; y++) {
for(int x = 0 ; x < CHUNK_WIDTH ; x++) {
int maxChunkZ = heightmap.getHighestChunkAt(x + spawnChunkX * CHUNK_WIDTH, y + spawnChunkY * CHUNK_DEPTH);
int worldZ = heightmap.getHighestBlockAt(x + spawnChunkX * CHUNK_WIDTH, y + spawnChunkY * CHUNK_DEPTH) + 1;
int z = gk::pmod(worldZ, CHUNK_WIDTH);
world.generateChunk(world.getOrCreateChunk(spawnChunkX - 1, spawnChunkY, maxChunkZ));
world.generateChunk(world.getOrCreateChunk(spawnChunkX + 1, spawnChunkY, maxChunkZ));
world.generateChunk(world.getOrCreateChunk(spawnChunkX, spawnChunkY - 1, maxChunkZ));
world.generateChunk(world.getOrCreateChunk(spawnChunkX, spawnChunkY + 1, maxChunkZ));
world.generateChunk(world.getOrCreateChunk(spawnChunkX, spawnChunkY, maxChunkZ - 1));
world.generateChunk(world.getOrCreateChunk(spawnChunkX, spawnChunkY, maxChunkZ + 1));
world.generateChunk(world.getOrCreateChunk(spawnChunkX - 1, spawnChunkY, maxChunkZ));
world.generateChunk(world.getOrCreateChunk(spawnChunkX + 1, spawnChunkY, maxChunkZ));
world.generateChunk(world.getOrCreateChunk(spawnChunkX, spawnChunkY - 1, maxChunkZ));
world.generateChunk(world.getOrCreateChunk(spawnChunkX, spawnChunkY + 1, maxChunkZ));
world.generateChunk(world.getOrCreateChunk(spawnChunkX, spawnChunkY, maxChunkZ - 1));
world.generateChunk(world.getOrCreateChunk(spawnChunkX, spawnChunkY, maxChunkZ + 1));
ServerChunk &chunk = world.getOrCreateChunk(spawnChunkX, spawnChunkY, maxChunkZ);
world.generateChunk(chunk);
ServerChunk &chunk = world.getOrCreateChunk(spawnChunkX, spawnChunkY, maxChunkZ);
world.generateChunk(chunk);
const BlockState *blockBelow = chunk.getBlockState(x, y, z - 1);
const Block &blockFeet = m_registry.getBlock(chunk.getBlock(x, y, z));
const Block &blockHead = m_registry.getBlock(chunk.getBlock(x, y, z + 1));
const BlockState *blockBelow = chunk.getBlockState(x, y, z - 1);
const Block &blockFeet = m_registry.getBlock(chunk.getBlock(x, y, z));
const Block &blockHead = m_registry.getBlock(chunk.getBlock(x, y, z + 1));
if (blockFeet.id() == 0 && blockHead.id() == 0
&& blockBelow && blockBelow->isCollidable()
&& blockBelow->drawType() != BlockDrawType::Leaves)
{
player->setPosition(x + spawnChunkX * CHUNK_WIDTH + .5, y + spawnChunkY * CHUNK_DEPTH + .5, worldZ + .2);
hasFoundPosition = true;
break;
if (blockFeet.id() == 0 && blockHead.id() == 0
&& blockBelow && blockBelow->isCollidable()
&& blockBelow->drawType() != BlockDrawType::Leaves)
{
player->setPosition(x + spawnChunkX * CHUNK_WIDTH + .5, y + spawnChunkY * CHUNK_DEPTH + .5, worldZ + .2);
hasFoundPosition = true;
break;
}
}
if (hasFoundPosition)
break;
}
}
if (hasFoundPosition)
break;
}
if (!hasFoundPosition)