From 8051fa4f6d4cb235b6ed3bf207b672c899b08158 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 3 Dec 2018 21:39:17 +0000 Subject: [PATCH] Remove some direct Position->level accesses --- src/pocketmine/block/BlockFactory.php | 5 +---- src/pocketmine/item/PaintingItem.php | 2 +- src/pocketmine/level/Level.php | 6 +----- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/pocketmine/block/BlockFactory.php b/src/pocketmine/block/BlockFactory.php index d72db93e28..7251e6523d 100644 --- a/src/pocketmine/block/BlockFactory.php +++ b/src/pocketmine/block/BlockFactory.php @@ -538,10 +538,7 @@ class BlockFactory{ } if($pos !== null){ - $block->x = $pos->getFloorX(); - $block->y = $pos->getFloorY(); - $block->z = $pos->getFloorZ(); - $block->level = $pos->level; + $block->position($pos->getLevel(), $pos->getFloorX(), $pos->getFloorY(), $pos->getFloorZ()); } return $block; diff --git a/src/pocketmine/item/PaintingItem.php b/src/pocketmine/item/PaintingItem.php index fe09a4454a..b8cf24bfd5 100644 --- a/src/pocketmine/item/PaintingItem.php +++ b/src/pocketmine/item/PaintingItem.php @@ -51,7 +51,7 @@ class PaintingItem extends Item{ continue; } - if(Painting::canFit($player->level, $blockReplace, $face, true, $motive)){ + if(Painting::canFit($player->getLevel(), $blockReplace, $face, true, $motive)){ if($currentTotalDimension > $totalDimension){ $totalDimension = $currentTotalDimension; /* diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index ff1370e1bd..c3f41d6a13 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -1368,11 +1368,7 @@ class Level implements ChunkManager, Metadatable{ } $block = BlockFactory::get($id, $meta); - - $block->x = $x; - $block->y = $y; - $block->z = $z; - $block->level = $this; + $block->position($this, $x, $y, $z); static $dynamicStateRead = false;