diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 56da2cc7e0..fb1ffcaea3 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -406,7 +406,7 @@ public class UnitTypes implements ContentList{ BulletType sapper = new SapBulletType(){{ sapStrength = 0.8f; length = 55f; - damage = 35; + damage = 34; shootEffect = Fx.shootSmall; hitColor = color = Color.valueOf("bf92f9"); despawnEffect = Fx.none; @@ -663,7 +663,7 @@ public class UnitTypes implements ContentList{ BulletType fragBullet = new FlakBulletType(4f, 5){{ shootEffect = Fx.shootBig; ammoMultiplier = 4f; - splashDamage = 40f; + splashDamage = 42f; splashDamageRadius = 25f; collidesGround = true; lifetime = 38f; @@ -700,7 +700,7 @@ public class UnitTypes implements ContentList{ x = 11f; y = 27f; rotateSpeed = 2f; - reload = 10f; + reload = 9f; shootSound = Sounds.flame; occlusion = 7f; rotate = true; diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java index 5c3e370256..d2e236b0f8 100644 --- a/core/src/mindustry/net/BeControl.java +++ b/core/src/mindustry/net/BeControl.java @@ -97,7 +97,10 @@ public class BeControl{ BaseDialog dialog = new BaseDialog("@be.updating"); download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> { try{ - Runtime.getRuntime().exec(new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()}); + Runtime.getRuntime().exec(OS.isMac ? + new String[]{"java", "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()} : + new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()} + ); System.exit(0); }catch(IOException e){ ui.showException(e); diff --git a/core/src/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/mindustry/world/blocks/sandbox/ItemSource.java index 4a52e6b8ae..70933f737b 100644 --- a/core/src/mindustry/world/blocks/sandbox/ItemSource.java +++ b/core/src/mindustry/world/blocks/sandbox/ItemSource.java @@ -23,6 +23,7 @@ public class ItemSource extends Block{ group = BlockGroup.transportation; configurable = true; saveConfig = true; + noUpdateDisabled = true; config(Item.class, (ItemSourceBuild tile, Item item) -> tile.outputItem = item); configClear((ItemSourceBuild tile) -> tile.outputItem = null); diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java index 3f01313833..10f7ff2710 100644 --- a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java @@ -24,6 +24,7 @@ public class LiquidSource extends Block{ configurable = true; outputsLiquid = true; saveConfig = true; + noUpdateDisabled = true; config(Liquid.class, (LiquidSourceBuild tile, Liquid l) -> tile.source = l); configClear((LiquidSourceBuild tile) -> tile.source = null);