Merge pull request #47869 from Jamuro-g/Fix-disassembly-component-dis…

…play fix disassembly component display
CleverRaven · Mar 5, 2021 · 5960368 · 5960368
2 parents 74a732f + 68daf0d
commit 5960368
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/item.cpp b/src/item.cpp
@@ -10616,7 +10616,15 @@ std::vector<item_comp> item::get_uncraft_components() const
     } else {
         //Make a new vector of components from the registered components
         for( const item &component : components ) {
-            ret.push_back( item_comp( component.typeId(), component.count() ) );
+            auto iter = std::find_if( ret.begin(), ret.end(), [component]( item_comp & obj ) {
+                return obj.type == component.typeId();
+            } );
+
+            if( iter != ret.end() ) {
+                iter->count += component.count();
+            } else {
+                ret.push_back( item_comp( component.typeId(), component.count() ) );
+            }
         }
     }
     return ret;