From fba7a5d66e6741a886b22d72b5da64d5bb0e59d5 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Tue, 31 May 2022 13:41:35 +0300 Subject: [PATCH] fixed dyes --- src/recipes/CraftingRecipes.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/recipes/CraftingRecipes.php b/src/recipes/CraftingRecipes.php index 0288b787..bedba90c 100644 --- a/src/recipes/CraftingRecipes.php +++ b/src/recipes/CraftingRecipes.php @@ -227,7 +227,14 @@ class CraftingRecipes{ $id = $id[0]; $it = BlockAPI::fromString($id); - $recipeItems[$it->getID()] = array($it->getID(), $meta === "?" ? false:intval($meta)&0xFFFF, intval($item[1])); + if(!isset($recipeItems[$it->getID()])){ + $recipeItems[$it->getID()] = array($it->getID(), $meta === "?" ? false:intval($meta)&0xFFFF, intval($item[1])); + }else{ + if($it->getMetadata() !== $recipeItems[$it->getID()][1]){ + $recipeItems[$it->getID()][1] = false; + } + $recipeItems[$it->getID()][2] += $it->count; + } } ksort($recipeItems); $item = explode("x", $recipe[1]); @@ -285,7 +292,6 @@ class CraftingRecipes{ } $recipeString = substr($recipeString, 0, -1)."=>".$craftItem[0]."x".$craftItem[2]; $server = ServerAPI::request(); - $result = $server->query("SELECT id FROM recipes WHERE type == ".$type." AND recipe == '".$recipeString."';"); if($result instanceof SQLite3Result){ $continue = true;