Merge pull request #35504 from Fris0uman/stop_spilling_ur_nones

Fixes none dropping
CleverRaven · Nov 13, 2019 · 1baef90 · 1baef90
2 parents 859b556 + 2b666e9
commit 1baef90
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/player.cpp b/src/player.cpp
@@ -2048,7 +2048,7 @@ void player::apply_damage( Creature *source, body_part hurt, int dam, const bool
     g->events().send<event_type::character_takes_damage>( getID(), dam_to_bodypart );
 
     if( hp_cur[hurtpart] <= 0 && ( source == nullptr || !source->is_hallucination() ) ) {
-        if( !can_wield( weapon ).success() ) {
+        if( !weapon.is_null() && !can_wield( weapon ).success() ) {
             put_into_vehicle_or_drop( *this, item_drop_reason::tumbling, { weapon } );
             i_rem( &weapon );
         }