mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 20:29:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Sea port map fixes

Browse Source
This commit is contained in:
Anuken 2024-10-02 21:06:22 -04:00
parent d431ed8480
commit 24daa1e933
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/seaPort.msav
View File

Binary file not shown.

2
core/src/mindustry/core/NetServer.java
View File

@ -423,7 +423,7 @@ public class NetServer implements ApplicationListener{
}
});
clientCommands.<Player>register("vote", "<y/n/c>", "Vote to kick the current player. Admin can cancel the voting with 'c'.", (arg, player) -> {
clientCommands.<Player>register("vote", "<y/n/c>", "Vote to kick the current player. Admins can cancel the voting with 'c'.", (arg, player) -> {
if(currentlyKicking == null){
player.sendMessage("[scarlet]Nobody is being voted on.");
}else{

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

@ -168,7 +168,7 @@ public class Weapon implements Cloneable{
t.row();
t.add("[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)inaccuracy + " " + StatUnit.degrees.localized());
}
if(!alwaysContinuous && reload > 0){
if(!alwaysContinuous && reload > 0 && !bullet.killShooter){
t.row();
t.add("[lightgray]" + Stat.reload.localized() + ": " + (mirror ? "2x " : "") + "[white]" + Strings.autoFixed(60f / reload * shoot.shots, 2) + " " + StatUnit.perSecond.localized());
}

2
core/src/mindustry/ui/fragments/PlacementFragment.java
View File

@ -400,7 +400,7 @@ public class PlacementFragment{
}
}).growX().left().margin(3);
if(!displayBlock.isPlaceable() || !player.isBuilder()){
if((!displayBlock.isPlaceable() || !player.isBuilder()) && !state.rules.editor){
topTable.row();
topTable.table(b -> {
b.image(Icon.cancel).padRight(2).color(Color.scarlet);