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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2018-10-30 09:24:43 -04:00
parent 6e65096bb4
commit 5aba065413
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/world/Build.java
View File

@@ -132,7 +132,7 @@ public class Build{
if(tile == null) return false; if(tile == null) return false;
if(type.isMultiblock()){ if(type.isMultiblock()){
if(type.canReplace(tile.block()) && tile.block().size == type.size){ if(type.canReplace(tile.block()) && tile.block().size == type.size && type.canPlaceOn(tile)){
return true; return true;
} }

2
core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java
View File

@@ -122,7 +122,7 @@ public abstract class LiquidTurret extends Turret{
@Override @Override
public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount){ public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount){
return super.acceptLiquid(tile, source, liquid, amount) && liquidAmmoMap.get(liquid) != null return super.acceptLiquid(tile, source, liquid, amount) && liquidAmmoMap.get(liquid) != null
&& (tile.entity.liquids.current() == liquid || tile.entity.liquids.get(tile.entity.liquids.current()) < 0.01f); && (tile.entity.liquids.current() == liquid || (liquidAmmoMap.containsKey(tile.entity.liquids.current()) && tile.entity.liquids.get(tile.entity.liquids.current()) <= liquidAmmoMap.get(tile.entity.liquids.current()).quantityMultiplier + 0.001f));
} }
} }