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

Possible fix for #1661

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-09-24 16:47:53 +02:00
parent 6cb7e36f8a
commit ef3674a296
5 changed files with 29 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pocketmine/level/Level.php
View File

@ -1519,14 +1519,19 @@ class Level implements ChunkManager, Metadatable{
}
}
public function setChunk($x, $z, FullChunk $chunk){
public function setChunk($x, $z, FullChunk $chunk, $unload = true){
$index = Level::chunkHash($x, $z);
foreach($this->getUsingChunk($x, $z) as $player){
$player->unloadChunk($x, $z);
if($unload){
foreach($this->getUsingChunk($x, $z) as $player){
$player->unloadChunk($x, $z);
}
unset($this->chunks[$index]);
$this->provider->setChunk($x, $z, $chunk);
$this->loadChunk($x, $z);
}else{
$this->provider->setChunk($x, $z, $chunk);
$this->chunks[$index] = $chunk;
}
unset($this->chunks[$index]);
$this->provider->setChunk($x, $z, $chunk);
$this->loadChunk($x, $z);
}
/**
@ -1800,10 +1805,8 @@ class Level implements ChunkManager, Metadatable{
$this->timings->doChunkUnload->startTiming();
if($this->getAutoSave()){
if(isset($this->chunks[$index])){
$this->provider->setChunk($x, $z, $this->chunks[$index]);
}
if($chunk instanceof FullChunk and $this->getAutoSave()){
$this->provider->setChunk($x, $z, $chunk);
$this->provider->saveChunk($x, $z);
}

20
src/pocketmine/level/format/anvil/Anvil.php
View File

@ -98,20 +98,12 @@ class Anvil extends McRegion{
$chunk->setProvider($this);
if($chunk->isPopulated() === false){
$this->unloadChunk($chunkX, $chunkZ, false);
$regionX = $regionZ = null;
self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ);
$this->loadRegion($regionX, $regionZ);
$region = $this->getRegion($regionX, $regionZ);
$region->removeChunk($chunkX - $region->getX() * 32, $chunkZ - $region->getZ() * 32);
$this->loadChunk($chunkX, $chunkZ);
}else{
$chunk->setX($chunkX);
$chunk->setZ($chunkZ);
$this->chunks[Level::chunkHash($chunkX, $chunkZ)] = $chunk;
//$this->saveChunk($chunkX, $chunkZ);
}
self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ);
$this->loadRegion($regionX, $regionZ);
$chunk->setX($chunkX);
$chunk->setZ($chunkZ);
$this->chunks[Level::chunkHash($chunkX, $chunkZ)] = $chunk;
}
public static function createChunkSection($Y){

6
src/pocketmine/level/format/anvil/Chunk.php
View File

@ -182,10 +182,8 @@ class Chunk extends BaseChunk{
$tiles = [];
foreach($this->getTiles() as $tile){
if($tile->closed !== true){
$tile->saveNBT();
$tiles[] = $tile->namedtag;
}
$tile->saveNBT();
$tiles[] = $tile->namedtag;
}
$nbt->Entities = new Enum("TileEntities", $tiles);

6
src/pocketmine/level/format/mcregion/Chunk.php
View File

@ -288,10 +288,8 @@ class Chunk extends BaseFullChunk{
$tiles = [];
foreach($this->getTiles() as $tile){
if($tile->closed !== true){
$tile->saveNBT();
$tiles[] = $tile->namedtag;
}
$tile->saveNBT();
$tiles[] = $tile->namedtag;
}
$nbt->Entities = new Enum("TileEntities", $tiles);

20
src/pocketmine/level/format/mcregion/McRegion.php
View File

@ -262,20 +262,12 @@ class McRegion extends BaseLevelProvider{
$chunk->setProvider($this);
if($chunk->isPopulated() === false){
$this->unloadChunk($chunkX, $chunkZ, false);
$regionX = $regionZ = null;
self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ);
$this->loadRegion($regionX, $regionZ);
$region = $this->getRegion($regionX, $regionZ);
$region->removeChunk($chunkX - $region->getX() * 32, $chunkZ - $region->getZ() * 32);
$this->loadChunk($chunkX, $chunkZ);
}else{
$chunk->setX($chunkX);
$chunk->setZ($chunkZ);
$this->chunks[Level::chunkHash($chunkX, $chunkZ)] = $chunk;
//$this->saveChunk($chunkX, $chunkZ);
}
self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ);
$this->loadRegion($regionX, $regionZ);
$chunk->setX($chunkX);
$chunk->setZ($chunkZ);
$this->chunks[Level::chunkHash($chunkX, $chunkZ)] = $chunk;
}
public static function createChunkSection($Y){