Skip to content

Commit d33aa79

Browse files
pandinocoderpandinocoder
authored
fix: cleanup properly on client disconnect (AscensionGameDev#2103)
1 parent 602e13b commit d33aa79

File tree

26 files changed

+304
-206
lines changed

26 files changed

+304
-206
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ csharp_style_namespace_declarations = file_scoped:silent
138138
# ReSharper properties
139139
resharper_place_expr_property_on_single_line = true
140140
resharper_trailing_comma_in_multiline_lists = true
141+
resharper_wrap_array_initializer_style = chop_if_long
141142
###############################
142143
# VB Coding Conventions #
143144
###############################

‎Intersect (Core)/Network/AbstractNetwork.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected AbstractNetwork(IApplicationContext applicationContext, NetworkConfigu
6868

6969
public NetworkConfiguration Configuration { get; }
7070

71-
public Guid Guid { get; protected set; }
71+
public Guid Id { get; protected set; }
7272

7373
public bool AddConnection(IConnection connection)
7474
{

‎Intersect (Core)/Network/INetwork.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface INetwork : IDisposable
2020

2121
bool IsConnected { get; }
2222

23-
Guid Guid { get; }
23+
Guid Id { get; }
2424

2525
int Ping => default;
2626

‎Intersect.Client.Framework/Network/GameSocket.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public abstract partial class GameSocket
1616

1717
public abstract void Dispose();
1818

19-
public abstract bool IsConnected();
19+
public abstract bool IsConnected { get; }
2020

2121
public abstract int Ping { get; }
2222

@@ -48,7 +48,7 @@ protected void OnDisconnected(INetworkLayerInterface sender, ConnectionEventArgs
4848
Disconnected?.Invoke(sender, connectionEventArgs);
4949
}
5050

51-
public abstract INetwork GetNetwork();
51+
public abstract INetwork Network { get; }
5252
}
5353

5454
public delegate void DataReceivedHandler(IPacket packet);

‎Intersect.Client/Interface/Menu/CreateCharacterWindow.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public void Init()
200200

201201
public void Update()
202202
{
203-
if (!Networking.Network.Connected)
203+
if (!Networking.Network.IsConnected)
204204
{
205205
Hide();
206206
mMainMenu.Show();

‎Intersect.Client/Interface/Menu/ForgotPasswordWindow.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private void Textbox_Clicked(Base sender, ClickedEventArgs arguments)
9898
//Methods
9999
public void Update()
100100
{
101-
if (!Networking.Network.Connected)
101+
if (!Networking.Network.IsConnected)
102102
{
103103
Hide();
104104
mMainMenu.Show();
@@ -148,7 +148,7 @@ void SubmitBtn_Clicked(Base sender, ClickedEventArgs arguments)
148148

149149
public void TrySendCode()
150150
{
151-
if (!Networking.Network.Connected)
151+
if (!Networking.Network.IsConnected)
152152
{
153153
Interface.MsgboxErrors.Add(new KeyValuePair<string, string>("", Strings.Errors.notconnected));
154154

‎Intersect.Client/Interface/Menu/LoginWindow.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private void _usernameTextbox_Clicked(Base sender, ClickedEventArgs arguments)
156156
//Methods
157157
public void Update()
158158
{
159-
if (!Networking.Network.Connected)
159+
if (!Networking.Network.IsConnected)
160160
{
161161
Hide();
162162
mMainMenu.Show();
@@ -205,6 +205,8 @@ void BackBtn_Clicked(Base sender, ClickedEventArgs arguments)
205205
{
206206
Hide();
207207
mMainMenu.Show();
208+
209+
Networking.Network.DebounceClose("returning_to_main_menu");
208210
}
209211

210212
void UsernameTextbox_SubmitPressed(Base sender, EventArgs arguments)
@@ -229,7 +231,7 @@ public void TryLogin()
229231
return;
230232
}
231233

232-
if (!Networking.Network.Connected)
234+
if (!Networking.Network.IsConnected)
233235
{
234236
Interface.MsgboxErrors.Add(new KeyValuePair<string, string>("", Strings.Errors.notconnected));
235237

‎Intersect.Client/Interface/Menu/MainMenuWindow.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private static void ButtonExitOnClicked(Base sender, ClickedEventArgs arguments)
9292

9393
private void ButtonLoginOnClicked(Base sender, ClickedEventArgs arguments)
9494
{
95-
if (Networking.Network.Connected)
95+
if (Networking.Network.InterruptDisconnectsIfConnected())
9696
{
9797
_mainMenu.SwitchToWindow<LoginWindow>();
9898
}
@@ -132,7 +132,7 @@ private void LoginConnected(object? sender, EventArgs eventArgs)
132132

133133
private void ButtonRegisterOnClicked(Base sender, ClickedEventArgs arguments)
134134
{
135-
if (Networking.Network.Connected)
135+
if (Networking.Network.InterruptDisconnectsIfConnected())
136136
{
137137
_mainMenu.SwitchToWindow<RegisterWindow>();
138138
}
@@ -186,7 +186,7 @@ internal void Reset()
186186

187187
internal void Update()
188188
{
189-
if (Networking.Network.Connected)
189+
if (Networking.Network.IsConnected)
190190
{
191191
_buttonLogin.IsDisabled = Globals.WaitingOnServer;
192192
_buttonRegister.IsDisabled = Globals.WaitingOnServer;

‎Intersect.Client/Interface/Menu/RegisterWindow.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public RegisterWindow(Canvas parent, MainMenu mainMenu)
149149
//Methods
150150
public void Update()
151151
{
152-
if (!Networking.Network.Connected)
152+
if (!Networking.Network.IsConnected)
153153
{
154154
Hide();
155155
mMainMenu.Show();
@@ -189,7 +189,7 @@ void TryRegister()
189189
return;
190190
}
191191

192-
if (Networking.Network.Connected)
192+
if (Networking.Network.IsConnected)
193193
{
194194
if (FieldChecking.IsValidUsername(mUsernameTextbox.Text, Strings.Regex.username))
195195
{
@@ -280,6 +280,8 @@ void BackBtn_Clicked(Base sender, ClickedEventArgs arguments)
280280
{
281281
Hide();
282282
mMainMenu.Show();
283+
284+
Networking.Network.DebounceClose("returning_to_main_menu");
283285
}
284286

285287
}

‎Intersect.Client/Interface/Menu/ResetPasswordWindow.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ private void Textbox_Clicked(Base sender, ClickedEventArgs arguments)
139139
//Methods
140140
public void Update()
141141
{
142-
if (!Networking.Network.Connected)
142+
if (!Networking.Network.IsConnected)
143143
{
144144
Hide();
145145
mMainMenu.Show();
@@ -193,7 +193,7 @@ public void TrySendCode()
193193
return;
194194
}
195195

196-
if (!Networking.Network.Connected)
196+
if (!Networking.Network.IsConnected)
197197
{
198198
Interface.MsgboxErrors.Add(new KeyValuePair<string, string>("", Strings.Errors.notconnected));
199199

0 commit comments

Comments
 (0)