mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 00:33:59 +00:00
Code Issues Projects Releases Wiki Activity

Added __clone() for Chunk and SubChunk

Browse Source 
we need this because the flatworld generator uses clone to produce new chunks, so we don't want the chunks getting fucked up.
This commit is contained in:
Dylan K. Taylor 2020-11-01 16:14:25 +00:00
parent 1d551af54a
commit 315962c12c
4 changed files with 114 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/world/format/Chunk.php
View File

@ -476,6 +476,15 @@ class Chunk{
}
}
public function __clone(){
//we don't bother cloning entities or tiles since it's impractical to do so (too many dependencies)
$this->subChunks = \SplFixedArray::fromArray(array_map(function(SubChunk $subChunk) : SubChunk{
return clone $subChunk;
}, $this->subChunks->toArray()));
$this->heightMap = clone $this->heightMap;
$this->biomeIds = clone $this->biomeIds;
}
/**
* Hashes the given chunk block coordinates into a single integer.
*

10
src/world/format/SubChunk.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\world\format;
use function array_map;
use function array_values;
use function count;
@ -141,4 +142,13 @@ class SubChunk{
$this->skyLight->collectGarbage();
$this->blockLight->collectGarbage();
}
public function __clone(){
$this->blockLayers = array_map(function(PalettedBlockArray $array) : PalettedBlockArray{
return clone $array;
}, $this->blockLayers);
$this->skyLight = clone $this->skyLight;
$this->blockLight = clone $this->blockLight;
}
}

45
tests/phpunit/world/format/ChunkTest.php Normal file
View File

@ -0,0 +1,45 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
declare(strict_types=1);
namespace pocketmine\world\format;
use PHPUnit\Framework\TestCase;
class ChunkTest extends TestCase{
public function testClone() : void{
$chunk = new Chunk(0, 0);
$chunk->setFullBlock(0, 0, 0, 1);
$chunk->setBiomeId(0, 0, 1);
$chunk->setHeightMap(0, 0, 1);
$chunk2 = clone $chunk;
$chunk2->setFullBlock(0, 0, 0, 2);
$chunk2->setBiomeId(0, 0, 2);
$chunk2->setHeightMap(0, 0, 2);
self::assertNotSame($chunk->getFullBlock(0, 0, 0), $chunk2->getFullBlock(0, 0, 0));
self::assertNotSame($chunk->getBiomeId(0, 0), $chunk2->getBiomeId(0, 0));
self::assertNotSame($chunk->getHeightMap(0, 0), $chunk2->getHeightMap(0, 0));
}
}

50
tests/phpunit/world/format/SubChunkTest.php Normal file
View File

@ -0,0 +1,50 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
declare(strict_types=1);
namespace pocketmine\world\format;
use PHPUnit\Framework\TestCase;
class SubChunkTest extends TestCase{
/**
* Test that a cloned SubChunk instance doesn't influence the original
*/
public function testClone() : void{
$sub1 = new SubChunk(0, []);
$sub1->setFullBlock(0, 0, 0, 1);
$sub1->getBlockLightArray()->set(0, 0, 0, 1);
$sub1->getBlockSkyLightArray()->set(0, 0, 0, 1);
$sub2 = clone $sub1;
$sub2->setFullBlock(0, 0, 0, 2);
$sub2->getBlockLightArray()->set(0, 0, 0, 2);
$sub2->getBlockSkyLightArray()->set(0, 0, 0, 2);
self::assertNotSame($sub1->getFullBlock(0, 0, 0), $sub2->getFullBlock(0, 0, 0));
self::assertNotSame($sub1->getBlockLightArray()->get(0, 0, 0), $sub2->getBlockLightArray()->get(0, 0, 0));
self::assertNotSame($sub1->getBlockSkyLightArray()->get(0, 0, 0), $sub2->getBlockSkyLightArray()->get(0, 0, 0));
}
}