diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a85c617d6a..84eba8e14a 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -196,6 +196,7 @@ servers.local = Local Servers servers.remote = Remote Servers servers.global = Community Servers +servers.disclaimer = Community servers are [accent]not[] owned or controlled by the developer.\n\nServers may contain user-generated content that is not appropriate for all ages. servers.showhidden = Show Hidden Servers server.shown = Shown server.hidden = Hidden diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index 81d4e628ab..187a962b6e 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -402,7 +402,16 @@ public class JoinDialog extends BaseDialog{ container.button(b -> buildServer(host, b), Styles.cleart, () -> { Events.fire(new ClientPreConnectEvent(host)); - safeConnect(host.address, host.port, host.version); + if(!Core.settings.getBool("server-disclaimer", false)){ + ui.showCustomConfirm("@warning", "@servers.disclaimer", "@ok", "@back", () -> { + Core.settings.put("server-disclaimer", true); + safeConnect(host.address, host.port, host.version); + }, () -> { + Core.settings.put("server-disclaimer", false); + }); + }else{ + safeConnect(host.address, host.port, host.version); + } }).width(w).row(); }