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

Improved block reading

Browse Source 
* Created global block states array
* Improved Level->getBlock() using block states
* Improved Level->getBlock() for 64-bit systems
* Added Level->getFullBlock()
* Added FullChunk->getFullBlock()
* Added Chunk->getFullBlock()
* Added ChunkSection->getFullBlock()
* Deprecated FullChunk->getBlock()
* Deprecated Chunk->getBlock()
* Deprecated ChunkSection->getBlock()
This commit is contained in:
Shoghi Cervantes 2014-12-08 20:54:47 +01:00
parent 1041bb0e6a
commit 3bb2f12cde
9 changed files with 87 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/block/Block.php
View File

@ -528,6 +528,9 @@ class Block extends Position implements Metadatable{
/** @var \SplFixedArray */
public static $list = null;
/** @var \SplFixedArray */
public static $fullList = null;
/** @var \SplFixedArray */
public static $light = null;
/** @var \SplFixedArray */
@ -572,6 +575,7 @@ class Block extends Position implements Metadatable{
public static function init(){
if(self::$list === null){
self::$list = new \SplFixedArray(256);
self::$fullList = new \SplFixedArray(4096);
self::$light = new \SplFixedArray(256);
self::$lightFilter = new \SplFixedArray(256);
self::$solid = new \SplFixedArray(256);
@ -728,6 +732,11 @@ class Block extends Position implements Metadatable{
if($class !== null){
/** @var Block $block */
$block = new $class();
for($data = 0; $data < 16; ++$data){
self::$fullList[($id << 4) | $data] = new $class($data);
}
self::$solid[$id] = $block->isSolid();
self::$transparent[$id] = $block->isTransparent();
self::$light[$id] = $block->getLightLevel();
@ -749,6 +758,12 @@ class Block extends Position implements Metadatable{
self::$lightFilter[$id] = 1;
}
}
foreach(self::$fullList as $id => $block){
if($block === null){
self::$fullList[$id] = new Block($id >> 4, $id & 0x0f);
}
}
}
}

2
src/pocketmine/inventory/PlayerInventory.php
View File

@ -467,7 +467,7 @@ class PlayerInventory extends BaseInventory{
}
/**
* @return Human
* @return Human|Player
*/
public function getHolder(){
return parent::getHolder();

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

@ -895,6 +895,17 @@ class Level implements ChunkManager, Metadatable{
return $level;
}
/**
* @param $x
* @param $y
* @param $z
*
* @return int bitmap, (id << 4) | data
*/
public function getFullBlock($x, $y, $z){
return $this->getChunk($x >> 4, $z >> 4, false)->getFullBlock($x & 0x0f, $y & 0x7f, $z & 0x0f);
}
/**
* Gets the Block object on the Vector3 location
*
@ -904,25 +915,21 @@ class Level implements ChunkManager, Metadatable{
* @return Block
*/
public function getBlock(Vector3 $pos, $cached = true){
$blockId = 0;
$meta = 0;
$index = "{$pos->x}:{$pos->y}:{$pos->z}";
$fullState = 0;
$index = PHP_INT_SIZE === 8 ? (($pos->x & 0xFFFFFFF) << 35) | (($pos->y & 0x7f) << 28) | ($pos->z & 0xFFFFFFF) : "{$pos->x}:{$pos->y}:{$pos->z}";
if($cached and isset($this->blockCache[$index])){
return $this->blockCache[$index];
}elseif($pos->y >= 0 and $pos->y < 128 and ($chunk = $this->getChunk($pos->x >> 4, $pos->z >> 4, true)) !== null){
$chunk->getBlock($pos->x & 0x0f, $pos->y & 0x7f, $pos->z & 0x0f, $blockId, $meta);
}elseif($pos->y >= 0 and $pos->y < 128 and ($chunk = $this->getChunk($pos->x >> 4, $pos->z >> 4, false)) !== null){
$fullState = $chunk->getFullBlock($pos->x & 0x0f, $pos->y, $pos->z & 0x0f);
}
if($blockId === 0){
$air = new Air();
$air->x = $pos->x;
$air->y = $pos->y;
$air->z = $pos->z;
$air->level = $this;
return $this->blockCache[$index] = $air;
}
$block = clone Block::$fullList[$fullState];
$block->x = $pos->x;
$block->y = $pos->y;
$block->z = $pos->z;
$block->level = $this;
return $this->blockCache[$index] = Block::get($blockId, $meta, $this->temporalPosition->setComponents($pos->x, $pos->y, $pos->z));
return $this->blockCache[$index] = $block;
}
public function updateAllLight(Vector3 $pos){

13
src/pocketmine/level/format/ChunkSection.php
View File

@ -65,6 +65,8 @@ interface ChunkSection{
/**
* Modifies $blockId and $meta
*
* @deprecated
*
* @param int $x 0-15
* @param int $y 0-15
* @param int $z 0-15
@ -73,6 +75,17 @@ interface ChunkSection{
*/
public function getBlock($x, $y, $z, &$blockId, &$meta = null);
/**
* Gets block and meta in one go
*
* @param int $x 0-15
* @param int $y 0-15
* @param int $z 0-15
*
* @return int bitmap, (id << 4) | data
*/
public function getFullBlock($x, $y, $z);
/**
* @param int $x 0-15
* @param int $y 0-15

13
src/pocketmine/level/format/FullChunk.php
View File

@ -54,6 +54,8 @@ interface FullChunk{
/**
* Modifies $blockId and $meta
*
* @deprecated
*
* @param int $x 0-15
* @param int $y 0-127
* @param int $z 0-15
@ -62,6 +64,17 @@ interface FullChunk{
*/
public function getBlock($x, $y, $z, &$blockId, &$meta = null);
/**
* Gets block and meta in one go
*
* @param int $x 0-15
* @param int $y 0-15
* @param int $z 0-15
*
* @return int bitmap, (id << 4) | data
*/
public function getFullBlock($x, $y, $z);
/**
* @param int $x 0-15
* @param int $y 0-127

12
src/pocketmine/level/format/anvil/ChunkSection.php
View File

@ -71,13 +71,17 @@ class ChunkSection implements \pocketmine\level\format\ChunkSection{
}
public function getBlock($x, $y, $z, &$blockId, &$meta = null){
$full = $this->getFullBlock($x, $y, $z);
$blockId = $full >> 4;
$meta = $full & 0x0f;
}
public function getFullBlock($x, $y, $z){
$i = ($y << 8) + ($z << 4) + $x;
$blockId = ord($this->blocks{$i});
$m = ord($this->data{$i >> 1});
if(($x & 1) === 0){
$meta = $m & 0x0F;
return (ord($this->blocks{$i}) << 4) | (ord($this->data{$i >> 1}) & 0x0F);
}else{
$meta = $m >> 4;
return (ord($this->blocks{$i}) << 4) | (ord($this->data{$i >> 1}) >> 4);
}
}

8
src/pocketmine/level/format/generic/BaseChunk.php
View File

@ -87,7 +87,13 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
}
public function getBlock($x, $y, $z, &$blockId, &$meta = null){
$this->sections[$y >> 4]->getBlock($x, $y & 0x0f, $z, $blockId, $meta);
$full = $this->sections[$y >> 4]->getFullBlock($x, $y & 0x0f, $z);
$blockId = $full >> 4;
$meta = $full & 0x0f;
}
public function getFullBlock($x, $y, $z){
return $this->sections[$y >> 4]->getFullBlock($x, $y & 0x0f, $z);
}
public function setBlock($x, $y, $z, $blockId = null, $meta = null){

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

@ -120,17 +120,21 @@ class Chunk extends BaseFullChunk{
$this->hasChanged = true;
}
public function getBlock($x, $y, $z, &$blockId, &$meta = null){
public function getFullBlock($x, $y, $z){
$i = ($x << 11) + ($z << 7) + $y;
$blockId = ord($this->blocks{$i});
$m = ord($this->data{$i >> 1});
if(($y & 1) === 0){
$meta = $m & 0x0F;
return (ord($this->blocks{$i}) << 4) | (ord($this->data{$i >> 1}) & 0x0F);
}else{
$meta = $m >> 4;
return (ord($this->blocks{$i}) << 4) | (ord($this->data{$i >> 1}) >> 4);
}
}
public function getBlock($x, $y, $z, &$blockId, &$meta = null){
$full = $this->getFullBlock($x, $y, $z);
$blockId = $full >> 4;
$meta = $full & 0x0f;
}
public function setBlock($x, $y, $z, $blockId = null, $meta = null){
$i = ($x << 11) + ($z << 7) + $y;

2
src/pocketmine/plugin/PluginDescription.php
View File

@ -67,8 +67,6 @@ class PluginDescription{
$this->api = !is_array($plugin["api"]) ? [$plugin["api"]] : $plugin["api"];
if(stripos($this->main, "pocketmine\\") === 0){
throw new PluginException("Invalid PluginDescription main, cannot start within the PocketMine namespace");
return;
}
if(isset($plugin["commands"]) and is_array($plugin["commands"])){