Chunks no longer contain their own coordinates

This commit is contained in:
Dylan K. Taylor
2020-12-03 21:59:30 +00:00
parent 1f5998d24c
commit c808095978
23 changed files with 99 additions and 134 deletions

View File

@@ -66,7 +66,7 @@ class ChunkRequestTask extends AsyncTask{
}
public function onRun() : void{
$chunk = FastChunkSerializer::deserialize($this->chunk, $this->chunkX, $this->chunkZ);
$chunk = FastChunkSerializer::deserialize($this->chunk);
$subCount = ChunkSerializer::getSubChunkCount($chunk);
$payload = ChunkSerializer::serialize($chunk, RuntimeBlockMapping::getInstance(), $this->tiles);
$this->setResult($this->compressor->compress(PacketBatch::fromPackets(LevelChunkPacket::withoutCache($this->chunkX, $this->chunkZ, $subCount, $payload))->getBuffer()));

View File

@@ -183,9 +183,9 @@ class ChunkCache implements ChunkListener{
/**
* @see ChunkListener::onChunkChanged()
*/
public function onChunkChanged(Chunk $chunk) : void{
public function onChunkChanged(int $chunkX, int $chunkZ, Chunk $chunk) : void{
//FIXME: this gets fired for stuff that doesn't change terrain related things (like lighting updates)
$this->destroyOrRestart($chunk->getX(), $chunk->getZ());
$this->destroyOrRestart($chunkX, $chunkZ);
}
/**
@@ -200,9 +200,9 @@ class ChunkCache implements ChunkListener{
/**
* @see ChunkListener::onChunkUnloaded()
*/
public function onChunkUnloaded(Chunk $chunk) : void{
$this->destroy($chunk->getX(), $chunk->getZ());
$this->world->unregisterChunkListener($this, $chunk->getX(), $chunk->getZ());
public function onChunkUnloaded(int $chunkX, int $chunkZ, Chunk $chunk) : void{
$this->destroy($chunkX, $chunkZ);
$this->world->unregisterChunkListener($this, $chunkX, $chunkZ);
}
/**