From 4df2b5ef9dff70c2cb2693f7ede13f49115db3e5 Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Tue, 23 Jul 2024 00:55:27 +0500 Subject: [PATCH] handle wrong beatrun_domain error gracefully --- .../content/resource/localization/en/beatrun.properties | 3 --- .../content/resource/localization/it/beatrun.properties | 3 --- .../content/resource/localization/pl/beatrun.properties | 3 --- .../content/resource/localization/pt-BR/beatrun.properties | 3 --- .../content/resource/localization/ru/beatrun.properties | 3 --- .../content/resource/localization/tr/beatrun.properties | 3 --- .../content/resource/localization/uk/beatrun.properties | 3 --- beatrun/gamemodes/beatrun/gamemode/cl/CoursesDatabase.lua | 6 +++++- beatrun/gamemodes/beatrun/gamemode/cl/ToolMenuSettings.lua | 3 --- 9 files changed, 5 insertions(+), 25 deletions(-) diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties index c105a2e..1c09569 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties @@ -102,9 +102,6 @@ beatrun.toolsmenu.hud.dynamicdesc=Hides HUD when moving beatrun.toolsmenu.hud.sway=HUD Sway beatrun.toolsmenu.hud.swaydesc=Toggles HUD swaying -beatrun.toolsmenu.hud.reticle=Show Reticle -beatrun.toolsmenu.hud.reticledesc=Shows a dot in the center of the screen - beatrun.toolsmenu.hud.nametags=Show Nametags beatrun.toolsmenu.hud.nametagsdesc=Toggles nametags above players diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/it/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/it/beatrun.properties index cee9e70..5cd0d15 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/it/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/it/beatrun.properties @@ -99,9 +99,6 @@ beatrun.toolsmenu.hud.dynamicdesc=Nasconde l'HUD durante lo spostamento beatrun.toolsmenu.hud.sway=Oscillazione dell'HUD beatrun.toolsmenu.hud.swaydesc=Attiva/disattiva l'oscillazione dell'HUD -beatrun.toolsmenu.hud.reticle=Mostra reticolo -beatrun.toolsmenu.hud.reticledesc=Mostra un punto al centro dello schermo - beatrun.toolsmenu.hud.nametags=Show Nametags beatrun.toolsmenu.hud.nametagsdesc=Attiva/disattiva i nametag sopra i giocatori diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/pl/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/pl/beatrun.properties index b5d791d..3b233d9 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/pl/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/pl/beatrun.properties @@ -100,9 +100,6 @@ beatrun.toolsmenu.hud.dynamicdesc=Ukrywa interfejs w ruchu beatrun.toolsmenu.hud.sway=Kołysanie interfejsu beatrun.toolsmenu.hud.swaydesc=Włącz/Wyłącz kołysanie interfejsu -beatrun.toolsmenu.hud.reticle=Pokaż kropkę -beatrun.toolsmenu.hud.reticledesc=Wyświetla kropkę na środku ekranu - beatrun.toolsmenu.hud.nametags=Pokaż identyfikatory beatrun.toolsmenu.hud.nametagsdesc=Włącz/Wyłącz wyświetlanie identyfikatorów nad graczami diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/pt-BR/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/pt-BR/beatrun.properties index 8b7ce86..920cc8b 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/pt-BR/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/pt-BR/beatrun.properties @@ -100,9 +100,6 @@ beatrun.toolsmenu.hud.dynamicdesc=Esconder a HUD enquanto estiver movendo beatrun.toolsmenu.hud.sway=Balanceamento da HUD beatrun.toolsmenu.hud.swaydesc=Ativar o Balanceamento da HUD -beatrun.toolsmenu.hud.reticle=Mostrar Retículo -beatrun.toolsmenu.hud.reticledesc=Mostra um ponto no centro da tela - beatrun.toolsmenu.hud.nametags=Mostrar crachás beatrun.toolsmenu.hud.nametagsdesc=Mostrar crachás acima dos nomes de jogadores diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties index 4dd514f..9f1492c 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties @@ -102,9 +102,6 @@ beatrun.toolsmenu.hud.dynamicdesc=Прячет HUD во время движен beatrun.toolsmenu.hud.sway=Покачивание HUD beatrun.toolsmenu.hud.swaydesc=Покачивает HUD при разнообразных действиях -beatrun.toolsmenu.hud.reticle=Показать Точку -beatrun.toolsmenu.hud.reticledesc=Показывает точку по середине экрана - beatrun.toolsmenu.hud.nametags=Показать Ники beatrun.toolsmenu.hud.nametagsdesc=Показывает ники над игроками diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/tr/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/tr/beatrun.properties index 1c7a2be..50b9a3e 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/tr/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/tr/beatrun.properties @@ -100,9 +100,6 @@ beatrun.toolsmenu.hud.dynamicdesc=Hareket ederken arayüzü gizler beatrun.toolsmenu.hud.sway=Arayüz Sarsıntısı beatrun.toolsmenu.hud.swaydesc=Arayüz sallanmayı açar/kapatır -beatrun.toolsmenu.hud.reticle=Nişangahı Göster -beatrun.toolsmenu.hud.reticledesc=Ekranın ortasında bir nokta gösterir - beatrun.toolsmenu.hud.nametags=Ad Etiketlerini Göster beatrun.toolsmenu.hud.nametagsdesc=Oyuncuların üzerindeki ad etiketlerini açar diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/uk/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/uk/beatrun.properties index d6c5278..87eb30e 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/uk/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/uk/beatrun.properties @@ -101,9 +101,6 @@ beatrun.toolsmenu.hud.dynamicdesc=Пряче HUD під час руху beatrun.toolsmenu.hud.sway=Погойдування HUD beatrun.toolsmenu.hud.swaydesc=Погойдує HUD під час різноманітних дій -beatrun.toolsmenu.hud.reticle=Показати Точку -beatrun.toolsmenu.hud.reticledesc=Показує точку по середині екрана - beatrun.toolsmenu.hud.nametags=Показати Ніки beatrun.toolsmenu.hud.nametagsdesc=Показує ніки над гравцями diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/CoursesDatabase.lua b/beatrun/gamemodes/beatrun/gamemode/cl/CoursesDatabase.lua index 480d581..67cf012 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/CoursesDatabase.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/CoursesDatabase.lua @@ -45,7 +45,7 @@ function GetCourse(sharecode) http.Fetch(url, function(body, length, headers, code) local response = util.JSONToTable(body) - if response.res == 200 then + if response and response.res == 200 then print("Success! | Length: " .. length .. "\nLoading course...") local dir = "beatrun/courses/" .. currentMap .. "/" @@ -57,6 +57,10 @@ function GetCourse(sharecode) LoadCourseRaw(coursedata) return true + elseif not response then + print("Can't access the database! Please make sure that domain is correct") + + return false else print("Error! | Response: " .. response.message) diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/ToolMenuSettings.lua b/beatrun/gamemodes/beatrun/gamemode/cl/ToolMenuSettings.lua index 1f38081..bbef6ca 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/ToolMenuSettings.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/ToolMenuSettings.lua @@ -158,9 +158,6 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function() panel:CheckBox("#beatrun.toolsmenu.hud.sway", "Beatrun_HUDSway") panel:ControlHelp("#beatrun.toolsmenu.hud.swaydesc") - panel:CheckBox("#beatrun.toolsmenu.hud.reticle", "Beatrun_HUDReticle") - panel:ControlHelp("#beatrun.toolsmenu.hud.reticledesc") - panel:CheckBox("#beatrun.toolsmenu.hud.nametags", "Beatrun_Nametags") panel:ControlHelp("#beatrun.toolsmenu.hud.nametagsdesc")