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

Make Block->position() accept Level,x,y,z instead of Position

Browse Source 
since this is an internal method, it doesn't make sense to force a single parameter that requires potentially constructing a separate object just for the parameters, so we pass primitives instead, which are also easier to typehint against.
This commit is contained in:
Dylan K. Taylor
2018-12-03 21:18:22 +00:00
parent c3623478c1
commit 9fb365306a
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1530,13 +1530,9 @@ class Level implements ChunkManager, Metadatable{
$this->timings->setBlock->startTiming();
if(!($pos instanceof Position)){
$pos = $this->temporalPosition->setComponents($pos->x, $pos->y, $pos->z);
}
$block = clone $block;
$block->position($pos);
$block->position($this, $pos->x, $pos->y, $pos->z);
$block->writeStateToWorld();
$chunkHash = Level::chunkHash($pos->x >> 4, $pos->z >> 4);
@ -1823,14 +1819,14 @@ class Level implements ChunkManager, Metadatable{
if($item->canBePlaced()){
$hand = $item->getBlock();
$hand->position($blockReplace);
$hand->position($this, $blockReplace->x, $blockReplace->y, $blockReplace->z);
}else{
return false;
}
if($hand->canBePlacedAt($blockClicked, $clickVector, $face, true)){
$blockReplace = $blockClicked;
$hand->position($blockReplace);
$hand->position($this, $blockReplace->x, $blockReplace->y, $blockReplace->z);
}elseif(!$hand->canBePlacedAt($blockReplace, $clickVector, $face, false)){
return false;
}