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

Fixed core errors

Browse Source
This commit is contained in:
Anuken
2020-03-06 15:22:13 -05:00
parent 4358658889
commit 77f406e9b8
33 changed files with 97 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/world/consumers/ConsumeItemFilter.java
View File

@@ -34,7 +34,8 @@ public class ConsumeItemFilter extends Consume{
@Override
public void build(Tilec tile, Table table){
MultiReqImage image = new MultiReqImage();
content.items().each(i -> filter.get(i) && (!state.isCampaign() || data.isUnlocked(i)), item -> image.add(new ReqImage(new ItemImage(item.icon(Cicon.medium), 1), () -> tile.entity != null && tile.entity.items() != null && tile.entity.items().has(item))));
content.items().each(i -> filter.get(i) && (!state.isCampaign() || data.isUnlocked(i)), item -> image.add(new ReqImage(new ItemImage(item.icon(Cicon.medium), 1),
() -> tile.items() != null && tile.items().has(item))));
table.add(image).size(8 * 4);
}

2
core/src/mindustry/world/consumers/ConsumeLiquid.java
View File

@@ -28,7 +28,7 @@ public class ConsumeLiquid extends ConsumeLiquidBase{
@Override
public void build(Tilec tile, Table table){
table.add(new ReqImage(liquid.icon(Cicon.medium), () -> valid(tile.entity))).size(8 * 4);
table.add(new ReqImage(liquid.icon(Cicon.medium), () -> valid(tile))).size(8 * 4);
}
@Override

2
core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
View File

@@ -31,7 +31,7 @@ public class ConsumeLiquidFilter extends ConsumeLiquidBase{
public void build(Tilec tile, Table table){
Array<Liquid> list = content.liquids().select(l -> !l.isHidden() && filter.get(l));
MultiReqImage image = new MultiReqImage();
list.each(liquid -> image.add(new ReqImage(liquid.icon(Cicon.medium), () -> tile.entity != null && tile.entity.liquids() != null && tile.entity.liquids().get(liquid) >= use(tile.entity))));
list.each(liquid -> image.add(new ReqImage(liquid.icon(Cicon.medium), () -> tile.liquids() != null && tile.liquids().get(liquid) >= use(tile))));
table.add(image).size(8 * 4);
}

2
core/src/mindustry/world/consumers/ConsumePower.java
View File

@@ -73,7 +73,7 @@ public class ConsumePower extends Consume{
return (1f-entity.power().status)*capacity;
}else{
try{
return usage * Mathf.num(entity.block().shouldConsume(entity.tile()));
return usage * Mathf.num(entity.shouldConsume());
}catch(Exception e){
//HACK an error will only happen with a bar that is checking its requested power, and the entity is null/a different class
return 0;