diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 3f7e0d02ee..2faf856171 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -284,11 +284,11 @@ public class NetServer implements ApplicationListener{ }); //duration of a a kick in seconds - int kickDuration = 20 * 60; + int kickDuration = 60 * 60; //voting round duration in seconds float voteDuration = 0.5f * 60; //cooldown between votes - int voteCooldown = 60 * 2; + int voteCooldown = 60 * 1; class VoteSession{ Player target; diff --git a/core/src/mindustry/world/blocks/distribution/ItemConveyor.java b/core/src/mindustry/world/blocks/distribution/ItemConveyor.java index 2ac85d270b..8df13383b4 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/ItemConveyor.java @@ -136,7 +136,7 @@ public class ItemConveyor extends BaseConveyor implements Autotiler{ if(e.ys[i] > nextMax) e.ys[i] = nextMax; if(e.ys[i] > 0.5 && i > 0) e.mid = i - 1; - e.xs[i] = Mathf.approachDelta(e.xs[i], 0, 0.1f); + e.xs[i] = Mathf.approachDelta(e.xs[i], 0, speed*2); if(e.ys[i] >= 1f && offloadDir(tile, e.ids[i])){ //align X position if passing forwards @@ -151,7 +151,7 @@ public class ItemConveyor extends BaseConveyor implements Autotiler{ } } - if(e.minitem < itemSpace + (e.blendbits == 1 ? 0.5f : 0f)){ + if(e.minitem < itemSpace + (e.blendbits == 1 ? 0.3f : 0f)){ e.clogHeat = Mathf.lerpDelta(e.clogHeat, 1f, 0.02f); }else{ e.clogHeat = 0f; @@ -222,7 +222,7 @@ public class ItemConveyor extends BaseConveyor implements Autotiler{ ItemConveyorEntity e = tile.ent(); if(e.len >= capacity) return false; int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.rotation()); - return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.5f)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation())); + return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.7f)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation())); } @Override