diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java
index 0f52311b88..43eaf03323 100644
--- a/core/src/mindustry/ai/BlockIndexer.java
+++ b/core/src/mindustry/ai/BlockIndexer.java
@@ -192,7 +192,7 @@ public class BlockIndexer{
 
                 if(other == null) continue;
 
-                if(other.team == team && pred.get(other) && intSet.add(other.pos())){
+                if((team == null || other.team == team) && pred.get(other) && intSet.add(other.pos())){
                     cons.get(other);
                     any = true;
                 }
diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java
index 9ca41fb85a..e22891eba5 100644
--- a/core/src/mindustry/entities/Damage.java
+++ b/core/src/mindustry/entities/Damage.java
@@ -288,11 +288,6 @@ public class Damage{
         }else{
             Units.nearby(rect, cons);
         }
-        if(effect == StatusEffects.burning) {
-            indexer.eachBlock(null, x, y, radius, other -> other.team != team, other -> {
-                Damage.createIncend(x, y, 1f, (int) duration/50);
-            });
-        }
     }
 
     /** Damages all entities and blocks in a radius that are enemies of the team. */
diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 6e2b9ad9e8..76a1569303 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -189,6 +189,12 @@ public abstract class BulletType extends Content{
             if(status != StatusEffects.none){
                 Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround);
             }
+
+            if(effect == StatusEffects.burning) {
+                indexer.eachBlock(null, x, y, splashDamageRadius, other -> other.team != team, other -> {
+                    Damage.createIncend(x, y, damage/10f, (int) damage/10);
+                });
+            }
         }
 
         for(int i = 0; i < lightning; i++){