Merge branch 'smartcmd:main' into main

Minecraft.World/LivingEntity.cpp

@@ -1361,6 +1361,10 @@ bool LivingEntity::shouldShowName()
 
 Icon *LivingEntity::getItemInHandIcon(shared_ptr<ItemInstance> item, int layer)
 {
+    if (item->getItem()->hasMultipleSpriteLayers())
+    {
+        return item->getItem()->getLayerIcon(item->getAuxValue(), layer);
+    }
 	return item->getIcon();
 }
 
@@ -2006,4 +2010,4 @@ bool LivingEntity::isAlliedTo(Team *other)
 		return getTeam()->isAlliedTo(other);
 	}
 	return false;
-}
+}