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

Fixed #5725

Browse Source
This commit is contained in:
Anuken
2021-08-09 11:41:39 -04:00
parent 42486cd784
commit c60f6d155f
7 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/production/Pump.java
View File

@@ -87,7 +87,7 @@ public class Pump extends LiquidBlock{
public void draw(){
Draw.rect(name, x, y);
Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
Drawf.liquid(liquidRegion, x, y, liquids.currentAmount() / liquidCapacity, liquids.current().color);
}
@Override

5
core/src/mindustry/world/modules/LiquidModule.java
View File

@@ -143,11 +143,12 @@ public class LiquidModule extends BlockModule{
int count = legacy ? read.ub() : read.s();
for(int j = 0; j < count; j++){
int liquidid = legacy ? read.ub() : read.s();
Liquid liq = content.liquid(legacy ? read.ub() : read.s());
int liquidid = liq.id;
float amount = read.f();
liquids[liquidid] = amount;
if(amount > 0){
current = content.liquid(liquidid);
current = liq;
}
this.total += amount;
}