Merge pull request CleverRaven#38241 from Fris0uman/liquid_bash

Disallow bashing liquids
Soupster89 · Feb 23, 2020 · 5231875 · 5231875
2 parents 9015618 + d2634f5
commit 5231875
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/map.cpp b/src/map.cpp
@@ -2767,8 +2767,12 @@ void map::smash_items( const tripoint &p, const int power, const std::string &ca
     std::string damaged_item_name;
 
     std::vector<item> contents;
-    auto items = i_at( p );
+    map_stack items = i_at( p );
     for( auto i = items.begin(); i != items.end(); ) {
+        if( i->made_of( LIQUID ) ) {
+            i++;
+            continue;
+        }
         if( i->active ) {
             // Get the explosion item actor
             if( i->type->get_use( "explosion" ) != nullptr ) {