From 40168a457e8b129e763f3bc33fc458904cba2cca Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Tue, 18 Apr 2023 14:43:25 +0100
Subject: [PATCH] TypeConverter: fixed coreItemStackToNet() causing item NBT to
 be prepared twice hasNamedTag() calls getNamedTag(), which calls
 serializeCompoundTag(), which writes the item's properties into the given NBT
 tag.

---
 src/network/mcpe/convert/TypeConverter.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/network/mcpe/convert/TypeConverter.php b/src/network/mcpe/convert/TypeConverter.php
index e8826e591..3fe679196 100644
--- a/src/network/mcpe/convert/TypeConverter.php
+++ b/src/network/mcpe/convert/TypeConverter.php
@@ -135,9 +135,11 @@ class TypeConverter{
 		if($itemStack->isNull()){
 			return ItemStack::null();
 		}
-		$nbt = null;
-		if($itemStack->hasNamedTag()){
-			$nbt = clone $itemStack->getNamedTag();
+		$nbt = $itemStack->getNamedTag();
+		if($nbt->count() === 0){
+			$nbt = null;
+		}else{
+			$nbt = clone $nbt;
 		}
 
 		$isBlockItem = $itemStack->getId() < 256;