Merge pull request #36477 from Ramza13/trading_weapon

Fix trading with npc destroying wielded weapon
CleverRaven · Dec 27, 2019 · 50c0b67 · 50c0b67
2 parents eed5688 + 81b40a4
commit 50c0b67
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/npctrade.cpp b/src/npctrade.cpp
@@ -63,9 +63,6 @@ void npc_trading::transfer_items( std::vector<item_pricing> &stuff, player &give
         }
 
         if( ip.loc.where() == item_location::type::character ) {
-            if( gift.typeId() == giver.weapon.typeId() ) {
-                giver.remove_weapon();
-            }
             if( ip.charges > 0 ) {
                 giver.use_charges( gift.typeId(), charges );
             } else if( ip.count > 0 ) {