Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Leonwang4234
2020-10-02 18:17:51 -07:00
parent e17ad7a429
commit 88639fffc5
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/BlockIndexer.java
View File

@@ -192,7 +192,7 @@ public class BlockIndexer{
if(other == null) continue; 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); cons.get(other);
any = true; any = true;
} }

5
core/src/mindustry/entities/Damage.java
View File

@@ -288,11 +288,6 @@ public class Damage{
}else{ }else{
Units.nearby(rect, cons); 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. */ /** Damages all entities and blocks in a radius that are enemies of the team. */

6
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -189,6 +189,12 @@ public abstract class BulletType extends Content{
if(status != StatusEffects.none){ if(status != StatusEffects.none){
Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround); 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++){ for(int i = 0; i < lightning; i++){