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

CraftingTransaction: clean up some logic

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-03-08 20:44:52 +00:00
parent 2e125168c3
commit b2491a5874
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pocketmine/inventory/transaction/CraftingTransaction.php
View File

@ -111,6 +111,8 @@ class CraftingTransaction extends InventoryTransaction{
$minY = 0; $minY = 0;
$maxY = 0; $maxY = 0;
$empty = true;
foreach($this->inputs as $y => $row){ foreach($this->inputs as $y => $row){
foreach($row as $x => $item){ foreach($row as $x => $item){
if(!$item->isNull()){ if(!$item->isNull()){
@ -119,19 +121,18 @@ class CraftingTransaction extends InventoryTransaction{
$minY = min($minY, $y); $minY = min($minY, $y);
$maxY = max($maxY, $y); $maxY = max($maxY, $y);
$empty = false;
} }
} }
} }
$height = $maxY - $minY + 1; if($empty){
$width = $maxX - $minX + 1;
if($height === 0 or $width === 0){
return []; return [];
} }
$air = ItemFactory::get(Item::AIR, 0, 0); $air = ItemFactory::get(Item::AIR, 0, 0);
$reindexed = array_fill(0, $height, array_fill(0, $width, $air)); $reindexed = array_fill(0, $maxY - $minY + 1, array_fill(0, $maxX - $minX + 1, $air));
foreach($reindexed as $y => $row){ foreach($reindexed as $y => $row){
foreach($row as $x => $item){ foreach($row as $x => $item){
$reindexed[$y][$x] = $this->inputs[$y + $minY][$x + $minX]; $reindexed[$y][$x] = $this->inputs[$y + $minY][$x + $minX];