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

Merge remote-tracking branch 'origin/next-minor' into next-major

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-12-25 18:22:13 +00:00
parent a8edb92565 0d169b4e80
commit c89df7eb1c
16 changed files with 136 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crafting/CraftingManagerFromDataHelper.php
View File

@ -39,11 +39,11 @@ use pocketmine\data\SavedDataLoadingException;
use pocketmine\errorhandler\ErrorToExceptionHandler;
use pocketmine\item\Item;
use pocketmine\nbt\LittleEndianNbtSerializer;
use pocketmine\utils\Filesystem;
use pocketmine\utils\Utils;
use pocketmine\world\format\io\GlobalItemDataHandlers;
use Symfony\Component\Filesystem\Path;
use function base64_decode;
use function file_get_contents;
use function get_debug_type;
use function is_array;
use function is_object;
@ -156,7 +156,7 @@ final class CraftingManagerFromDataHelper{
* @phpstan-return list<TData>
*/
public static function loadJsonArrayOfObjectsFile(string $filePath, string $modelCLass) : array{
$recipes = json_decode(Utils::assumeNotFalse(file_get_contents($filePath), "Missing required resource file"));
$recipes = json_decode(Filesystem::fileGetContents($filePath));
if(!is_array($recipes)){
throw new SavedDataLoadingException("$filePath root should be an array, got " . get_debug_type($recipes));
}