mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-26 06:22:17 -08:00
Code Issues Projects Releases Wiki Activity

Fixed #2427 / Fixed #2429

Browse source
This commit is contained in:
Anuken 2020-08-26 09:21:18 -04:00
parent 1461673168
commit be74e954fa
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/src/mindustry/content/UnitTypes.java
View file

@ -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;

5
core/src/mindustry/net/BeControl.java
View file

@ -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);

1
core/src/mindustry/world/blocks/sandbox/ItemSource.java
View file

@ -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);

1
core/src/mindustry/world/blocks/sandbox/LiquidSource.java
View file

@ -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);