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

 Conflicts:
	gradle.properties
This commit is contained in:
Anuken
2021-10-05 12:08:58 -04:00
12 changed files with 73 additions and 34 deletions

View File

@@ -57,7 +57,7 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
accepting = 0f;
if(amount >= maxLiquid / 1.5f){
float deposited = Math.min((amount - maxLiquid / 1.5f) / 4f, 0.3f) * Time.delta;
float deposited = Math.min((amount - maxLiquid / 1.5f) / 4f, 0.3f * Time.delta);
int targets = 0;
for(Point2 point : Geometry.d4){
Tile other = world.tile(tile.x + point.x, tile.y + point.y);