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

Fixed #2501

Browse Source
This commit is contained in:
Anuken
2020-09-06 09:41:48 -04:00
parent 50a94af0d1
commit e5674b1b1e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View File

@@ -209,7 +209,6 @@ public class Blocks implements ContentList{
liquidDrop = Liquids.slag; liquidDrop = Liquids.slag;
isLiquid = true; isLiquid = true;
cacheLayer = CacheLayer.slag; cacheLayer = CacheLayer.slag;
attributes.set(Attribute.heat, 0.85f);
}}; }};
stone = new Floor("stone"){{ stone = new Floor("stone"){{
@@ -1132,7 +1131,6 @@ public class Blocks implements ContentList{
powerProduction = 1.8f; powerProduction = 1.8f;
generateEffect = Fx.redgeneratespark; generateEffect = Fx.redgeneratespark;
size = 2; size = 2;
floating = true;
}}; }};
turbineGenerator = new BurnerGenerator("turbine-generator"){{ turbineGenerator = new BurnerGenerator("turbine-generator"){{

12
core/src/mindustry/entities/comp/BulletComp.java
View File

@@ -29,8 +29,16 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
@Override @Override
public void getCollisions(Cons<QuadTree> consumer){ public void getCollisions(Cons<QuadTree> consumer){
for(Team team : team.enemies()){ if(team.active()){
consumer.get(teamIndex.tree(team)); 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));
}
}
} }
} }