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

CraftingTransaction: Start from pre-computed iteration count for input matching

Browse Source 
This will be faster to bail out on failures.
This commit is contained in:
Dylan K. Taylor 2018-04-04 12:15:46 +01:00
parent ef2dd1de92
commit 033b44df5a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,11 +44,11 @@ class CraftingTransaction extends InventoryTransaction{
* @param Item[] $txItems * @param Item[] $txItems
* @param Item[] $recipeItems * @param Item[] $recipeItems
* @param bool $wildcards * @param bool $wildcards
* @param int $iterations
* *
* @return int * @return int
* @throws TransactionValidationException
*/ */
protected function matchRecipeItems(array $txItems, array $recipeItems, bool $wildcards) : int{ protected function matchRecipeItems(array $txItems, array $recipeItems, bool $wildcards, int $iterations = 0) : int{
if(empty($recipeItems)){ if(empty($recipeItems)){
throw new TransactionValidationException("No recipe items given"); throw new TransactionValidationException("No recipe items given");
} }
@ -56,7 +56,6 @@ class CraftingTransaction extends InventoryTransaction{
throw new TransactionValidationException("No transaction items given"); throw new TransactionValidationException("No transaction items given");
} }
$iterations = 0;
while(!empty($recipeItems)){ while(!empty($recipeItems)){
/** @var Item $recipeItem */ /** @var Item $recipeItem */
$recipeItem = array_pop($recipeItems); $recipeItem = array_pop($recipeItems);
@ -120,7 +119,7 @@ class CraftingTransaction extends InventoryTransaction{
try{ try{
$this->repetitions = $this->matchRecipeItems($this->outputs, $this->recipe->getResultsFor($this->source->getCraftingGrid()), false); $this->repetitions = $this->matchRecipeItems($this->outputs, $this->recipe->getResultsFor($this->source->getCraftingGrid()), false);
if(($inputIterations = $this->matchRecipeItems($this->inputs, $this->recipe->getIngredientList(), true)) !== $this->repetitions){ if(($inputIterations = $this->matchRecipeItems($this->inputs, $this->recipe->getIngredientList(), true, $this->repetitions)) !== $this->repetitions){
throw new TransactionValidationException("Tried to craft recipe $this->repetitions times in batch, but have enough inputs for $inputIterations"); throw new TransactionValidationException("Tried to craft recipe $this->repetitions times in batch, but have enough inputs for $inputIterations");
} }
}catch(\InvalidStateException $e){ }catch(\InvalidStateException $e){