diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index a6b71198a9..4abe276b01 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -316,7 +316,8 @@ public class Vars implements Loadable{ logicVars = new GlobalVars(); javaPath = 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"; state = new GameState(); diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 0edd2387d0..6870046bd9 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -31,6 +31,8 @@ public class Weapon implements Cloneable{ public BulletType bullet = Bullets.placeholder; /** shell ejection effect */ 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 */ public boolean useAmmo = 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){ - return true; + return display; } public void addStats(UnitType u, Table t){ diff --git a/core/src/mindustry/type/weapons/BuildWeapon.java b/core/src/mindustry/type/weapons/BuildWeapon.java index 4ca1e55483..40bfa667e1 100644 --- a/core/src/mindustry/type/weapons/BuildWeapon.java +++ b/core/src/mindustry/type/weapons/BuildWeapon.java @@ -22,14 +22,10 @@ public class BuildWeapon extends Weapon{ rotate = true; noAttack = true; predictTarget = false; + display = false; bullet = new BulletType(); } - @Override - public boolean hasStats(UnitType u){ - return false; - } - @Override public void update(Unit unit, WeaponMount mount){ mount.shoot = false; diff --git a/servers_v7.json b/servers_v7.json index 981c0b575f..1b1c13b1e4 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -110,7 +110,7 @@ }, { "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", @@ -122,6 +122,6 @@ }, { "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"] } ]