mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-05 17:41:46 +00:00
Code Issues Projects Releases Wiki Activity

Liquid: Stop abusing getLevel() in performance-sensitive situations

Browse Source 
Most of these methods are called from onUpdate(). It's unreasonable to
assume that the level might be null during a tick (unless a plugin
messes with a block update event or something, but that's undefined
behaviour anyway). Using getLevel() simply wastes processing time by
constantly checking if the level is closed.
This commit is contained in:
Dylan K. Taylor 2017-11-24 16:57:59 +00:00
parent b88ffa3bdf
commit 74967eed87
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/pocketmine/block/Liquid.php
View File

@ -65,7 +65,7 @@ abstract class Liquid extends Transparent{
protected function getFlowDecay(Vector3 $pos){ protected function getFlowDecay(Vector3 $pos){
if(!($pos instanceof Block)){ if(!($pos instanceof Block)){
$pos = $this->getLevel()->getBlock($pos); $pos = $this->level->getBlock($pos);
} }
if($pos->getId() !== $this->getId()){ if($pos->getId() !== $this->getId()){
@ -77,7 +77,7 @@ abstract class Liquid extends Transparent{
protected function getEffectiveFlowDecay(Vector3 $pos){ protected function getEffectiveFlowDecay(Vector3 $pos){
if(!($pos instanceof Block)){ if(!($pos instanceof Block)){
$pos = $this->getLevel()->getBlock($pos); $pos = $this->level->getBlock($pos);
} }
if($pos->getId() !== $this->getId()){ if($pos->getId() !== $this->getId()){
@ -117,7 +117,7 @@ abstract class Liquid extends Transparent{
}elseif($j === 3){ }elseif($j === 3){
++$z; ++$z;
} }
$sideBlock = $this->getLevel()->getBlockAt($x, $y, $z); $sideBlock = $this->level->getBlockAt($x, $y, $z);
$blockDecay = $this->getEffectiveFlowDecay($sideBlock); $blockDecay = $this->getEffectiveFlowDecay($sideBlock);
if($blockDecay < 0){ if($blockDecay < 0){
@ -125,7 +125,7 @@ abstract class Liquid extends Transparent{
continue; continue;
} }
$blockDecay = $this->getEffectiveFlowDecay($this->getLevel()->getBlockAt($x, $y - 1, $z)); $blockDecay = $this->getEffectiveFlowDecay($this->level->getBlockAt($x, $y - 1, $z));
if($blockDecay >= 0){ if($blockDecay >= 0){
$realDecay = $blockDecay - ($decay - 8); $realDecay = $blockDecay - ($decay - 8);
@ -146,21 +146,21 @@ abstract class Liquid extends Transparent{
if($this->getDamage() >= 8){ if($this->getDamage() >= 8){
$falling = false; $falling = false;
if(!$this->getLevel()->getBlockAt($this->x, $this->y, $this->z - 1)->canBeFlowedInto()){ if(!$this->level->getBlockAt($this->x, $this->y, $this->z - 1)->canBeFlowedInto()){
$falling = true; $falling = true;
}elseif(!$this->getLevel()->getBlockAt($this->x, $this->y, $this->z + 1)->canBeFlowedInto()){ }elseif(!$this->level->getBlockAt($this->x, $this->y, $this->z + 1)->canBeFlowedInto()){
$falling = true; $falling = true;
}elseif(!$this->getLevel()->getBlockAt($this->x - 1, $this->y, $this->z)->canBeFlowedInto()){ }elseif(!$this->level->getBlockAt($this->x - 1, $this->y, $this->z)->canBeFlowedInto()){
$falling = true; $falling = true;
}elseif(!$this->getLevel()->getBlockAt($this->x + 1, $this->y, $this->z)->canBeFlowedInto()){ }elseif(!$this->level->getBlockAt($this->x + 1, $this->y, $this->z)->canBeFlowedInto()){
$falling = true; $falling = true;
}elseif(!$this->getLevel()->getBlockAt($this->x, $this->y + 1, $this->z - 1)->canBeFlowedInto()){ }elseif(!$this->level->getBlockAt($this->x, $this->y + 1, $this->z - 1)->canBeFlowedInto()){
$falling = true; $falling = true;
}elseif(!$this->getLevel()->getBlockAt($this->x, $this->y + 1, $this->z + 1)->canBeFlowedInto()){ }elseif(!$this->level->getBlockAt($this->x, $this->y + 1, $this->z + 1)->canBeFlowedInto()){
$falling = true; $falling = true;
}elseif(!$this->getLevel()->getBlockAt($this->x - 1, $this->y + 1, $this->z)->canBeFlowedInto()){ }elseif(!$this->level->getBlockAt($this->x - 1, $this->y + 1, $this->z)->canBeFlowedInto()){
$falling = true; $falling = true;
}elseif(!$this->getLevel()->getBlockAt($this->x + 1, $this->y + 1, $this->z)->canBeFlowedInto()){ }elseif(!$this->level->getBlockAt($this->x + 1, $this->y + 1, $this->z)->canBeFlowedInto()){
$falling = true; $falling = true;
} }
@ -192,7 +192,7 @@ abstract class Liquid extends Transparent{
public function onUpdate(int $type){ public function onUpdate(int $type){
if($type === Level::BLOCK_UPDATE_NORMAL){ if($type === Level::BLOCK_UPDATE_NORMAL){
$this->checkForHarden(); $this->checkForHarden();
$this->getLevel()->scheduleDelayedBlockUpdate($this, $this->tickRate()); $this->level->scheduleDelayedBlockUpdate($this, $this->tickRate());
}elseif($type === Level::BLOCK_UPDATE_SCHEDULED){ }elseif($type === Level::BLOCK_UPDATE_SCHEDULED){
if($this->temporalVector === null){ if($this->temporalVector === null){
$this->temporalVector = new Vector3(0, 0, 0); $this->temporalVector = new Vector3(0, 0, 0);
@ -242,10 +242,10 @@ abstract class Liquid extends Transparent{
if($k !== $decay){ if($k !== $decay){
$decay = $k; $decay = $k;
if($decay < 0){ if($decay < 0){
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true); $this->level->setBlock($this, BlockFactory::get(Block::AIR), true, true);
}else{ }else{
$this->getLevel()->setBlock($this, BlockFactory::get($this->id, $decay), true, true); $this->level->setBlock($this, BlockFactory::get($this->id, $decay), true, true);
$this->getLevel()->scheduleDelayedBlockUpdate($this, $this->tickRate()); $this->level->scheduleDelayedBlockUpdate($this, $this->tickRate());
} }
}elseif($flag){ }elseif($flag){
//$this->getLevel()->scheduleUpdate($this, $this->tickRate()); //$this->getLevel()->scheduleUpdate($this, $this->tickRate());
@ -259,11 +259,11 @@ abstract class Liquid extends Transparent{
$bottomBlock = $this->level->getBlockAt($this->x, $this->y - 1, $this->z); $bottomBlock = $this->level->getBlockAt($this->x, $this->y - 1, $this->z);
if($this instanceof Lava and $bottomBlock instanceof Water){ if($this instanceof Lava and $bottomBlock instanceof Water){
$this->getLevel()->setBlock($bottomBlock, BlockFactory::get(Block::STONE), true, true); $this->level->setBlock($bottomBlock, BlockFactory::get(Block::STONE), true, true);
}elseif($bottomBlock->canBeFlowedInto() or ($bottomBlock instanceof Liquid and ($bottomBlock->getDamage() & 0x07) !== 0)){ }elseif($bottomBlock->canBeFlowedInto() or ($bottomBlock instanceof Liquid and ($bottomBlock->getDamage() & 0x07) !== 0)){
$this->getLevel()->setBlock($bottomBlock, BlockFactory::get($this->id, $decay | 0x08), true, false); $this->level->setBlock($bottomBlock, BlockFactory::get($this->id, $decay | 0x08), true, false);
$this->getLevel()->scheduleDelayedBlockUpdate($bottomBlock, $this->tickRate()); $this->level->scheduleDelayedBlockUpdate($bottomBlock, $this->tickRate());
}elseif($decay === 0 or !$bottomBlock->canBeFlowedInto()){ }elseif($decay === 0 or !$bottomBlock->canBeFlowedInto()){
$flags = $this->getOptimalFlowDirections(); $flags = $this->getOptimalFlowDirections();
@ -305,11 +305,11 @@ abstract class Liquid extends Transparent{
private function flowIntoBlock(Block $block, $newFlowDecay){ private function flowIntoBlock(Block $block, $newFlowDecay){
if($block->canBeFlowedInto()){ if($block->canBeFlowedInto()){
if($block->getId() > 0){ if($block->getId() > 0){
$this->getLevel()->useBreakOn($block); $this->level->useBreakOn($block);
} }
$this->getLevel()->setBlock($block, BlockFactory::get($this->getId(), $newFlowDecay), true, false); $this->level->setBlock($block, BlockFactory::get($this->getId(), $newFlowDecay), true, false);
$this->getLevel()->scheduleDelayedBlockUpdate($block, $this->tickRate()); $this->level->scheduleDelayedBlockUpdate($block, $this->tickRate());
} }
} }
@ -336,13 +336,13 @@ abstract class Liquid extends Transparent{
}elseif($j === 3){ }elseif($j === 3){
++$z; ++$z;
} }
$blockSide = $this->getLevel()->getBlockAt($x, $y, $z); $blockSide = $this->level->getBlockAt($x, $y, $z);
if(!$blockSide->canBeFlowedInto() and !($blockSide instanceof Liquid)){ if(!$blockSide->canBeFlowedInto() and !($blockSide instanceof Liquid)){
continue; continue;
}elseif($blockSide instanceof Liquid and $blockSide->getDamage() === 0){ }elseif($blockSide instanceof Liquid and $blockSide->getDamage() === 0){
continue; continue;
}elseif($this->getLevel()->getBlockAt($x, $y - 1, $z)->canBeFlowedInto()){ }elseif($this->level->getBlockAt($x, $y - 1, $z)->canBeFlowedInto()){
return $accumulatedCost; return $accumulatedCost;
} }
@ -386,13 +386,13 @@ abstract class Liquid extends Transparent{
}elseif($j === 3){ }elseif($j === 3){
++$z; ++$z;
} }
$block = $this->getLevel()->getBlockAt($x, $y, $z); $block = $this->level->getBlockAt($x, $y, $z);
if(!$block->canBeFlowedInto() and !($block instanceof Liquid)){ if(!$block->canBeFlowedInto() and !($block instanceof Liquid)){
continue; continue;
}elseif($block instanceof Liquid and $block->getDamage() === 0){ }elseif($block instanceof Liquid and $block->getDamage() === 0){
continue; continue;
}elseif($this->getLevel()->getBlockAt($x, $y - 1, $z)->canBeFlowedInto()){ }elseif($this->level->getBlockAt($x, $y - 1, $z)->canBeFlowedInto()){
$this->flowCost[$j] = 0; $this->flowCost[$j] = 0;
}else{ }else{
$this->flowCost[$j] = $this->calculateFlowCost($block, 1, $j); $this->flowCost[$j] = $this->calculateFlowCost($block, 1, $j);
@ -437,9 +437,9 @@ abstract class Liquid extends Transparent{
if($colliding){ if($colliding){
if($this->getDamage() === 0){ if($this->getDamage() === 0){
$this->getLevel()->setBlock($this, BlockFactory::get(Block::OBSIDIAN), true, true); $this->level->setBlock($this, BlockFactory::get(Block::OBSIDIAN), true, true);
}elseif($this->getDamage() <= 4){ }elseif($this->getDamage() <= 4){
$this->getLevel()->setBlock($this, BlockFactory::get(Block::COBBLESTONE), true, true); $this->level->setBlock($this, BlockFactory::get(Block::COBBLESTONE), true, true);
} }
} }
} }