NetClient cleanup
This commit is contained in:
@@ -67,9 +67,7 @@ public class NetClient implements ApplicationListener{
|
|||||||
|
|
||||||
ui.loadfrag.setButton(() -> {
|
ui.loadfrag.setButton(() -> {
|
||||||
ui.loadfrag.hide();
|
ui.loadfrag.hide();
|
||||||
connecting = false;
|
disconnectQuietly();
|
||||||
quiet = true;
|
|
||||||
net.disconnect();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
ConnectPacket c = new ConnectPacket();
|
ConnectPacket c = new ConnectPacket();
|
||||||
@@ -353,9 +351,8 @@ public class NetClient implements ApplicationListener{
|
|||||||
|
|
||||||
ui.loadfrag.setButton(() -> {
|
ui.loadfrag.setButton(() -> {
|
||||||
ui.loadfrag.hide();
|
ui.loadfrag.hide();
|
||||||
netClient.connecting = false;
|
|
||||||
netClient.quiet = true;
|
netClient.disconnectQuietly();
|
||||||
net.disconnect();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -506,7 +503,7 @@ public class NetClient implements ApplicationListener{
|
|||||||
net.setClientLoaded(true);
|
net.setClientLoaded(true);
|
||||||
Core.app.post(Call::connectConfirm);
|
Core.app.post(Call::connectConfirm);
|
||||||
Time.runTask(40f, platform::updateRPC);
|
Time.runTask(40f, platform::updateRPC);
|
||||||
Core.app.post(() -> ui.loadfrag.hide());
|
Core.app.post(ui.loadfrag::hide);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void reset(){
|
private void reset(){
|
||||||
@@ -529,6 +526,7 @@ public class NetClient implements ApplicationListener{
|
|||||||
/** Disconnects, resetting state to the menu. */
|
/** Disconnects, resetting state to the menu. */
|
||||||
public void disconnectQuietly(){
|
public void disconnectQuietly(){
|
||||||
quiet = true;
|
quiet = true;
|
||||||
|
connecting = false;
|
||||||
net.disconnect();
|
net.disconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user