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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
This commit is contained in:
Anuken
2021-09-04 23:12:28 -04:00
parent ed1d4414a0 f20b9c828c
commit 393d3a19a3
12 changed files with 70 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/meta/StatValues.java
View File

@@ -130,7 +130,7 @@ public class StatValues{
if(state.isGame()){
var blocks = Vars.content.blocks()
.select(block -> (!checkFloors || block instanceof Floor) && indexer.isBlockPresent(block) && block.attributes.get(attr) != 0 && !((block instanceof Floor f && f.isLiquid) && !floating))
.select(block -> (!checkFloors || block instanceof Floor) && indexer.isBlockPresent(block) && block.attributes.get(attr) != 0 && !((block instanceof Floor f && f.isDeep()) && !floating))
.<Floor>as().with(s -> s.sort(f -> f.attributes.get(attr)));
if(blocks.any()){