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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-09-18 23:33:57 -04:00
parent cbd38003b1 991d98b718
commit e4fe0c24c1
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/Vars.java
View File

@@ -316,7 +316,8 @@ public class Vars implements Loadable{
logicVars = new GlobalVars(); logicVars = new GlobalVars();
javaPath = javaPath =
new Fi(OS.prop("java.home")).child("bin/java").exists() ? new Fi(OS.prop("java.home")).child("bin/java").absolutePath() : new Fi(OS.prop("java.home")).child("bin/java").exists() ? new Fi(OS.prop("java.home")).child("bin/java").absolutePath() :
Core.files.local("jre/bin/java").exists() ? Core.files.local("jre/bin/java").absolutePath() : Core.files.local("jre/bin/java").exists() ? Core.files.local("jre/bin/java").absolutePath() : // Unix
Core.files.local("jre/bin/java.exe").exists() ? Core.files.local("jre/bin/java.exe").absolutePath() : // Windows
"java"; "java";
state = new GameState(); state = new GameState();

4
core/src/mindustry/type/Weapon.java
View File

@@ -31,6 +31,8 @@ public class Weapon implements Cloneable{
public BulletType bullet = Bullets.placeholder; public BulletType bullet = Bullets.placeholder;
/** shell ejection effect */ /** shell ejection effect */
public Effect ejectEffect = Fx.none; public Effect ejectEffect = Fx.none;
/** whether weapon should appear in the stats of a unit with this weapon */
public boolean display = true;
/** whether to consume ammo when ammo is enabled in rules */ /** whether to consume ammo when ammo is enabled in rules */
public boolean useAmmo = true; public boolean useAmmo = true;
/** whether to create a flipped copy of this weapon upon initialization. default: true */ /** whether to create a flipped copy of this weapon upon initialization. default: true */
@@ -147,7 +149,7 @@ public class Weapon implements Cloneable{
} }
public boolean hasStats(UnitType u){ public boolean hasStats(UnitType u){
return true; return display;
} }
public void addStats(UnitType u, Table t){ public void addStats(UnitType u, Table t){

6
core/src/mindustry/type/weapons/BuildWeapon.java
View File

@@ -22,14 +22,10 @@ public class BuildWeapon extends Weapon{
rotate = true; rotate = true;
noAttack = true; noAttack = true;
predictTarget = false; predictTarget = false;
display = false;
bullet = new BulletType(); bullet = new BulletType();
} }
@Override
public boolean hasStats(UnitType u){
return false;
}
@Override @Override
public void update(Unit unit, WeaponMount mount){ public void update(Unit unit, WeaponMount mount){
mount.shoot = false; mount.shoot = false;

4
servers_v7.json
View File

@@ -110,7 +110,7 @@
}, },
{ {
"name": "Eradicationdustry", "name": "Eradicationdustry",
"address": ["n1.yeet.ml:6577", "n1.yeet.ml:6576", "n1.yeet.ml:6602", "n1.yeet.ml:6669", "eradicationmindustry.yeet.ml:9547"] "address": ["n1.yeet.ml:6577", "n1.yeet.ml:6576", "n1.yeet.ml:6602", "n1.yeet.ml:6669", "eradicationmindustry.yeet.ml:9547", "n1.yeet.ml:6593"]
}, },
{ {
"name": "AlternightBrasil", "name": "AlternightBrasil",
@@ -122,6 +122,6 @@
}, },
{ {
"name": "LightDustry", "name": "LightDustry",
"address": ["lightdustry.ddns.net:28583", "lightdustry.ddns.net:6567", "lightdustry.ddns.net:6568"] "address": ["lightdustry.ddns.net:28583", "lightdusy.ddns.net:6567", "lightdusy.ddns.net:6568"]
} }
] ]