Merge commit '3d50aafcc'

# Conflicts:
#	resources/vanilla
#	src/crafting/ShapedRecipe.php
This commit is contained in:
Dylan K. Taylor 2020-06-13 11:30:44 +01:00
commit fe1b5d2d01

View File

@ -154,7 +154,7 @@ class ShapedRecipe implements CraftingRecipe{
}
public function getIngredient(int $x, int $y) : Item{
$exists = $this->ingredientList[$this->shape[$y]{$x}] ?? null;
$exists = $this->ingredientList[$this->shape[$y][$x]] ?? null;
return $exists !== null ? clone $exists : ItemFactory::air();
}