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

Use VanillaItems::AIR() instead of ItemFactory

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-05-24 15:47:27 +01:00
parent 9a5a03ef83
commit 227f28a6d2
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/item/Item.php
View File

@ -678,7 +678,7 @@ class Item implements \JsonSerializable{
*/ */
public static function nbtDeserialize(CompoundTag $tag) : Item{ public static function nbtDeserialize(CompoundTag $tag) : Item{
if($tag->getTag("id") === null || $tag->getTag("Count") === null){ if($tag->getTag("id") === null || $tag->getTag("Count") === null){
return ItemFactory::getInstance()->get(0); return VanillaItems::AIR();
} }
$count = Binary::unsignByte($tag->getByte("Count")); $count = Binary::unsignByte($tag->getByte("Count"));

5
src/network/mcpe/convert/TypeConverter.php
View File

@ -36,6 +36,7 @@ use pocketmine\item\Durable;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\ItemFactory; use pocketmine\item\ItemFactory;
use pocketmine\item\ItemIds; use pocketmine\item\ItemIds;
use pocketmine\item\VanillaItems;
use pocketmine\nbt\NbtException; use pocketmine\nbt\NbtException;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\IntTag;
@ -126,7 +127,7 @@ class TypeConverter{
public function recipeIngredientToCoreItemStack(RecipeIngredient $ingredient) : Item{ public function recipeIngredientToCoreItemStack(RecipeIngredient $ingredient) : Item{
if($ingredient->getId() === 0){ if($ingredient->getId() === 0){
return ItemFactory::getInstance()->get(ItemIds::AIR, 0, 0); return VanillaItems::AIR();
} }
[$id, $meta] = ItemTranslator::getInstance()->fromNetworkIdWithWildcardHandling($ingredient->getId(), $ingredient->getMeta()); [$id, $meta] = ItemTranslator::getInstance()->fromNetworkIdWithWildcardHandling($ingredient->getId(), $ingredient->getMeta());
return ItemFactory::getInstance()->get($id, $meta, $ingredient->getCount()); return ItemFactory::getInstance()->get($id, $meta, $ingredient->getCount());
@ -202,7 +203,7 @@ class TypeConverter{
*/ */
public function netItemStackToCore(ItemStack $itemStack) : Item{ public function netItemStackToCore(ItemStack $itemStack) : Item{
if($itemStack->getId() === 0){ if($itemStack->getId() === 0){
return ItemFactory::getInstance()->get(ItemIds::AIR, 0, 0); return VanillaItems::AIR();
} }
$compound = $itemStack->getNbt(); $compound = $itemStack->getNbt();