Backporting CleverRaven#51096 Prevent inserting an item with NO_UNWIE…

…LD into a container
sonphantrung · Nov 27, 2021 · 4c58201 · 4c58201
1 parent 0d755db
commit 4c58201
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/item_pocket.cpp b/src/item_pocket.cpp
@@ -997,6 +997,11 @@ void item_pocket::favorite_info( std::vector<iteminfo> &info )
 
 ret_val<item_pocket::contain_code> item_pocket::can_contain( const item &it ) const
 {
+    if( it.has_flag( flag_NO_UNWIELD ) ) {
+        return ret_val<item_pocket::contain_code>::make_failure(
+                   contain_code::ERR_MOD, _( "cannot unwield item" ) );
+    }
+
     // To prevent debugmsg. Casings can only be inserted in a magazine during firing.
     if( data->type == item_pocket::pocket_type::MAGAZINE && it.has_flag( flag_CASING ) ) {
         return ret_val<item_pocket::contain_code>::make_success();