fix wont_hit_friend (#75760)

CleverRaven · Aug 18, 2024 · 9efea72 · 9efea72
1 parent 8bf39f8
commit 9efea72
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/npcmove.cpp b/src/npcmove.cpp
@@ -2712,6 +2712,10 @@ int npc::confident_throw_range( const item &thrown, Creature *target ) const
 // Index defaults to -1, i.e., wielded weapon
 bool npc::wont_hit_friend( const tripoint &tar, const item &it, bool throwing ) const
 {
+    if( !throwing && it.is_gun() && it.empty() ) {
+        return true;    // Prevent calling nullptr ammo_data
+    }
+
     if( throwing && rl_dist( pos(), tar ) == 1 ) {
         return true;    // If we're *really* sure that our aim is dead-on
     }