mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-17 19:50:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 0.17-chunks

Browse Source
This commit is contained in:
Dylan K. Taylor
2016-12-01 17:50:12 +00:00
parent 5025b4aba1 756760a2f0
commit ce289cbe25
13 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -529,7 +529,7 @@ class Level implements ChunkManager, Metadatable{
* @return Player[]
*/
public function getChunkPlayers(int $chunkX, int $chunkZ) : array{
return isset($this->playerLoaders[$index = Level::chunkHash($chunkX, $chunkZ)]) ? $this->playerLoaders[$index] : [];
return $this->playerLoaders[Level::chunkHash($chunkX, $chunkZ)] ?? [];
}
/**
@@ -541,7 +541,7 @@ class Level implements ChunkManager, Metadatable{
* @return ChunkLoader[]
*/
public function getChunkLoaders(int $chunkX, int $chunkZ) : array{
return isset($this->chunkLoaders[$index = Level::chunkHash($chunkX, $chunkZ)]) ? $this->chunkLoaders[$index] : [];
return $this->chunkLoaders[Level::chunkHash($chunkX, $chunkZ)] ?? [];
}
public function addChunkPacket(int $chunkX, int $chunkZ, DataPacket $packet){
@@ -885,7 +885,7 @@ class Level implements ChunkManager, Metadatable{
$chunkZ = $loader->getZ() >> 4;
$index = Level::chunkHash($chunkX, $chunkZ);
$existingLoaders = max(0, isset($this->chunkTickList[$index]) ? $this->chunkTickList[$index] : 0);
$existingLoaders = max(0, $this->chunkTickList[$index] ?? 0);
$this->chunkTickList[$index] = $existingLoaders + 1;
for($chunk = 0; $chunk < $chunksPerLoader; ++$chunk){
$dx = mt_rand(-$randRange, $randRange);
@@ -1742,7 +1742,7 @@ class Level implements ChunkManager, Metadatable{
* @return Entity
*/
public function getEntity(int $entityId){
return isset($this->entities[$entityId]) ? $this->entities[$entityId] : null;
return $this->entities[$entityId] ?? null;
}
/**
@@ -1829,7 +1829,7 @@ class Level implements ChunkManager, Metadatable{
* @return Tile
*/
public function getTileById(int $tileId){
return isset($this->tiles[$tileId]) ? $this->tiles[$tileId] : null;
return $this->tiles[$tileId] ?? null;
}
/**