diff --git a/core/assets/maps/seaPort.msav b/core/assets/maps/seaPort.msav index e61d8126b7..35813ec96b 100644 Binary files a/core/assets/maps/seaPort.msav and b/core/assets/maps/seaPort.msav differ diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index bcf22cedd6..94ea217ace 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -423,7 +423,7 @@ public class NetServer implements ApplicationListener{ } }); - clientCommands.register("vote", "", "Vote to kick the current player. Admin can cancel the voting with 'c'.", (arg, player) -> { + clientCommands.register("vote", "", "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{ diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 25812d316f..d097677d3c 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -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()); } diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index 19d0c1d422..603d816011 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -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);