Skip to content

Commit

Permalink
Merge pull request CleverRaven#77805 from PatrikLundell/explosion
Browse files Browse the repository at this point in the history
Ensure crushed characters are fetched from the correct location
  • Loading branch information
Night-Pryanik authored Nov 13, 2024
2 parents 1692e4a + 3c5b15c commit d4abac3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/map.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4622,7 +4622,7 @@ void map::batter( const tripoint_bub_ms &p, int power, int tries, const bool sil
void map::crush( const tripoint_bub_ms &p )
{
creature_tracker &creatures = get_creature_tracker();
Character *crushed_player = creatures.creature_at<Character>( p );
Character *crushed_player = creatures.creature_at<Character>( this->getglobal( p ) );

if( crushed_player != nullptr ) {
bool player_inside = false;
Expand Down

0 comments on commit d4abac3

Please sign in to comment.