thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix refresh spamming

Browse source
This commit is contained in:
RandomityGuy 2024-06-06 22:34:20 +05:30
parent 89580f1e23
commit 52b86baebc
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/MPServerListGui.hx
View file

@ -124,16 +124,24 @@ class MPServerListGui extends GuiImage {
backButton.pressedAction = (e) -> MarbleGame.canvas.setContent(new MainMenuGui()); backButton.pressedAction = (e) -> MarbleGame.canvas.setContent(new MainMenuGui());
bottomBar.addChild(backButton); bottomBar.addChild(backButton);
var refreshing = false;
var refreshButton = new GuiXboxButton("Refresh", 220); var refreshButton = new GuiXboxButton("Refresh", 220);
refreshButton.position = new Vector(750, 0); refreshButton.position = new Vector(750, 0);
refreshButton.vertSizing = Bottom; refreshButton.vertSizing = Bottom;
refreshButton.horizSizing = Right; refreshButton.horizSizing = Right;
refreshButton.pressedAction = (e) -> { refreshButton.pressedAction = (e) -> {
if (refreshing)
return;
refreshing = true;
MasterServerClient.connectToMasterServer(() -> { MasterServerClient.connectToMasterServer(() -> {
MasterServerClient.instance.getServerList((servers) -> { MasterServerClient.instance.getServerList((servers) -> {
ourServerList = servers; ourServerList = servers;
updateServerListDisplay(); updateServerListDisplay();
refreshing = false;
}); });
}, () -> {
refreshing = false;
}); });
} }
bottomBar.addChild(refreshButton); bottomBar.addChild(refreshButton);

14
src/net/MasterServerClient.hx
View file

@ -41,7 +41,7 @@ class MasterServerClient {
var stopMutex:sys.thread.Mutex = new sys.thread.Mutex(); var stopMutex:sys.thread.Mutex = new sys.thread.Mutex();
#end #end
public function new(onOpenFunc:() -> Void) { public function new(onOpenFunc:() -> Void, onErrorFunc:() -> Void) {
#if hl #if hl
wsThread = sys.thread.Thread.create(() -> { wsThread = sys.thread.Thread.create(() -> {
hl.Gc.enable(false); hl.Gc.enable(false);
@ -78,9 +78,15 @@ class MasterServerClient {
responses.add(() -> { responses.add(() -> {
MarbleGame.canvas.pushDialog(new MessageBoxOkDlg("Failed to connect to master server: " + m)); MarbleGame.canvas.pushDialog(new MessageBoxOkDlg("Failed to connect to master server: " + m));
}); });
if (onErrorFunc != null)
responses.add(() -> {
onErrorFunc();
});
#end #end
#if js #if js
MarbleGame.canvas.pushDialog(new MessageBoxOkDlg("Failed to connect to master server: " + m)); MarbleGame.canvas.pushDialog(new MessageBoxOkDlg("Failed to connect to master server: " + m));
if (onErrorFunc != null)
onErrorFunc();
#end #end
#if hl #if hl
stopMutex.acquire(); stopMutex.acquire();
@ -159,16 +165,16 @@ class MasterServerClient {
#end #end
} }
public static function connectToMasterServer(onConnect:() -> Void) { public static function connectToMasterServer(onConnect:() -> Void, onError:() -> Void = null) {
if (instance == null) if (instance == null)
instance = new MasterServerClient(onConnect); instance = new MasterServerClient(onConnect, onError);
else { else {
if (instance.open) if (instance.open)
onConnect(); onConnect();
else { else {
if (instance != null && instance.ws != null) if (instance != null && instance.ws != null)
instance.ws.close(); instance.ws.close();
instance = new MasterServerClient(onConnect); instance = new MasterServerClient(onConnect, onError);
} }
} }
} }