From a08518ed1c122f3d043ba49e7a3a72a9d1ddcbbb Mon Sep 17 00:00:00 2001
From: Bloop <13398309+vinylspiders@users.noreply.github.com>
Date: Mon, 1 Jan 2024 01:02:43 -0500
Subject: [PATCH] Fixes some undeleted sql queries (#231)
---
code/modules/client/client_procs.dm | 2 +-
.../modules/player_ranks/code/subsystem/player_ranks.dm | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 0a75de953ee..4de6675febc 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -683,6 +683,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(!client_is_in_db)
//NOVA EDIT ADDITION BEGIN - PANICBUNKER
if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey] && !(ckey in GLOB.bunker_passthrough))
+ qdel(query_client_in_db)
log_access("Failed Login: [key] - [address] - New account attempting to connect during panic bunker")
message_admins("Failed Login: [key] - [address] - New account attempting to connect during panic bunker")
to_chat_immediate(src, {"Hi! We have temporarily enabled safety measures that prevents new players from joining currently.
Please try again later, or contact a staff on Discord if you have any questions.
To join our community, check out our Discord! To gain full access to our Discord, read the rules and post a request in the #access-requests channel under the \"Landing Zone\" category in the Discord server linked here: https://discord.gg/6RpdCgR"}) //skyrat-edit
@@ -693,7 +694,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
to_chat(src, "Sending you to [panic_name ? panic_name : panic_addr].")
winset(src, null, "command=.options")
src << link("[panic_addr]?redirect=1")
- qdel(query_client_in_db)
qdel(src)
return
//NOVA EDIT END
diff --git a/modular_nova/modules/player_ranks/code/subsystem/player_ranks.dm b/modular_nova/modules/player_ranks/code/subsystem/player_ranks.dm
index 64ce3304732..3a0f8b0b827 100644
--- a/modular_nova/modules/player_ranks/code/subsystem/player_ranks.dm
+++ b/modular_nova/modules/player_ranks/code/subsystem/player_ranks.dm
@@ -222,9 +222,11 @@ SUBSYSTEM_DEF(player_ranks)
)
if(!query_load_player_rank.warn_execute())
+ qdel(query_load_player_rank)
return
rank_controller.load_from_query(query_load_player_rank)
+ qdel(query_load_player_rank)
/// Allows fetching the appropriate player_rank_controller based on its
@@ -333,9 +335,11 @@ SUBSYSTEM_DEF(player_ranks)
)
if(!query_add_player_rank.warn_execute())
+ qdel(query_add_player_rank)
return FALSE
controller.add_player(ckey)
+ qdel(query_add_player_rank)
return TRUE
@@ -412,9 +416,11 @@ SUBSYSTEM_DEF(player_ranks)
)
if(!query_remove_player_rank.warn_execute())
+ qdel(query_remove_player_rank)
return FALSE
controller.remove_player(ckey)
+ qdel(query_remove_player_rank)
return TRUE
@@ -468,12 +474,15 @@ SUBSYSTEM_DEF(player_ranks)
)
if(!query_get_existing_entries.warn_execute())
+ qdel(query_get_existing_entries)
return
while(query_get_existing_entries.NextRow())
var/ckey = ckey(query_get_existing_entries.item[INDEX_CKEY])
ckeys_to_migrate -= ckey
+ qdel(query_get_existing_entries)
+
var/list/rows_to_insert = list()
for(var/ckey in ckeys_to_migrate)