From e5674b1b1e4cc6c5e396455ef5bfc1f35b8dc003 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 6 Sep 2020 09:41:48 -0400
Subject: [PATCH] Fixed #2501

---
 core/src/mindustry/content/Blocks.java           |  2 --
 core/src/mindustry/entities/comp/BulletComp.java | 12 ++++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 56609d7e2e..7774e51993 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -209,7 +209,6 @@ public class Blocks implements ContentList{
             liquidDrop = Liquids.slag;
             isLiquid = true;
             cacheLayer = CacheLayer.slag;
-            attributes.set(Attribute.heat, 0.85f);
         }};
 
         stone = new Floor("stone"){{
@@ -1132,7 +1131,6 @@ public class Blocks implements ContentList{
             powerProduction = 1.8f;
             generateEffect = Fx.redgeneratespark;
             size = 2;
-            floating = true;
         }};
 
         turbineGenerator = new BurnerGenerator("turbine-generator"){{
diff --git a/core/src/mindustry/entities/comp/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java
index 107f1e00f1..2f46261be8 100644
--- a/core/src/mindustry/entities/comp/BulletComp.java
+++ b/core/src/mindustry/entities/comp/BulletComp.java
@@ -29,8 +29,16 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
 
     @Override
     public void getCollisions(Cons<QuadTree> consumer){
-        for(Team team : team.enemies()){
-            consumer.get(teamIndex.tree(team));
+        if(team.active()){
+            for(Team team : team.enemies()){
+                consumer.get(teamIndex.tree(team));
+            }
+        }else{
+            for(Team other : Team.all){
+                if(other != team && teamIndex.count(other) > 0){
+                    consumer.get(teamIndex.tree(other));
+                }
+            }
         }
     }