diff --git a/core/src/mindustry/ui/dialogs/TraceDialog.java b/core/src/mindustry/ui/dialogs/TraceDialog.java index 24a18a12d6..5648c954a7 100644 --- a/core/src/mindustry/ui/dialogs/TraceDialog.java +++ b/core/src/mindustry/ui/dialogs/TraceDialog.java @@ -26,13 +26,11 @@ public void show(Player player, TraceInfo info, boolean offline){ buttons.clear(); addCloseButton(); - buttons.button("JS Ban (Requires /js)", () -> { + buttons.button("JS Ban (Requires /js)", () -> ui.showConfirm("@confirm", Core.bundle.format("confirmban", player.name()), () -> { Call.sendChatMessage("/js Vars.netServer.admins.banPlayerID(" + info.uuid + ")"); Call.sendChatMessage("/js Vars.netServer.admins.banPlayerIP(" + info.ip + ")"); - }).width(420); - if(!offline){ - buttons.button("Ban (Won't work if they leave before pressed)", () -> Call.adminRequest(player, Packets.AdminAction.ban, null)).width(420); - } + })).width(420); + if(!offline) buttons.button("Ban (Won't work if they leave before pressed)", () -> ui.showConfirm("@confirm", Core.bundle.format("confirmban", player.name()), () -> Call.adminRequest(player, Packets.AdminAction.ban, null))).width(420); Table table = new Table(Tex.clear); table.margin(14); diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java index be9dc1b676..b1cf3c9fb7 100644 --- a/core/src/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -9,6 +9,7 @@ import arc.util.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; +import mindustry.client.utils.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.game.EventType.*; @@ -169,7 +170,7 @@ public void updateTile(){ warmup = Mathf.lerpDelta(warmup, efficiency, 0.1f); - if(buildup > 0){ + if(buildup > 0 && !CustomMode.flood.b()){ float scale = !broken ? cooldownNormal : cooldownBrokenBase; //TODO I hate this system