From 29f36c19276430c95bb1b2683eb94d04540ded85 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Sat, 18 Feb 2023 16:48:22 -0800 Subject: [PATCH] ClientServerConnectEvent (#8309) --- core/src/mindustry/game/EventType.java | 10 ++++++++++ core/src/mindustry/net/Net.java | 2 ++ 2 files changed, 12 insertions(+) diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index 52464b8839..cf44cea851 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -162,6 +162,16 @@ public class EventType{ } } + public static class ClientServerConnectEvent{ + public final String ip; + public final int port; + + public ClientServerConnectEvent(String ip, int port){ + this.ip = ip; + this.port = port; + } + } + /** Consider using Menus.registerMenu instead. */ public static class MenuOptionChooseEvent{ public final Player player; diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java index bac5531848..b04c2db7ac 100644 --- a/core/src/mindustry/net/Net.java +++ b/core/src/mindustry/net/Net.java @@ -5,6 +5,7 @@ import arc.func.*; import arc.net.*; import arc.struct.*; import arc.util.*; +import mindustry.game.EventType.*; import mindustry.gen.*; import mindustry.net.Packets.*; import mindustry.net.Streamable.*; @@ -154,6 +155,7 @@ public class Net{ public void connect(String ip, int port, Runnable success){ try{ if(!active){ + Events.fire(new ClientServerConnectEvent(ip, port)); provider.connectClient(ip, port, success); active = true; server = false;