From f1e40f7b779025043d501d116ae0d459e19aeb8b Mon Sep 17 00:00:00 2001 From: darknoon29 <13015521+darknoon29@users.noreply.github.com> Date: Tue, 16 Sep 2025 17:30:24 +0200 Subject: [PATCH] Update version to 2.11.3 and refactor astro object ID retrieval in defense and fleet queries --- version.txt | 2 +- xtense.php | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/version.txt b/version.txt index 57679a6..98f0d21 100755 --- a/version.txt +++ b/version.txt @@ -1,5 +1,5 @@ Xtense -2.11.2 +2.11.3 Xtense,Xtense,xtense,xtense,index.php,1,1 4.0.0-dev 3.0.0 diff --git a/xtense.php b/xtense.php index cb7bdf0..e7b0534 100755 --- a/xtense.php +++ b/xtense.php @@ -491,11 +491,6 @@ ON DUPLICATE KEY UPDATE name = '{$planet_name}'"); - // Récupérer l'ID de l'objet astro (nécessaire pour la table défense) - $astro_id_result = $db->sql_query("SELECT id FROM " . TABLE_USER_BUILDING . " - WHERE galaxy = {$g} AND system = {$s} AND row = {$r} AND type = '{$planet_type_str}'"); - $astro_object_id = $db->sql_fetch_row($astro_id_result)[0] ?? $planet_id; - // Préparer les champs pour la requête d'insertion/mise à jour des défenses $defense_fields = []; $defense_values = []; @@ -517,7 +512,7 @@ $db->sql_query("INSERT INTO " . TABLE_GAME_PLAYER_DEFENSE . " (astro_object_id, {$fields_str}) VALUES - ({$astro_object_id}, {$values_str}) + ({$planet_id}, {$values_str}) ON DUPLICATE KEY UPDATE " . implode(", ", $update_pairs)); } @@ -641,11 +636,6 @@ $db->sql_query($query); - // Récupérer l'ID de l'objet astro (nécessaire pour la table flotte) - $astro_id_result = $db->sql_query("SELECT id FROM " . TABLE_USER_BUILDING . " - WHERE galaxy = {$g} AND system = {$s} AND row = {$r} AND type = '{$planet_type_str}'"); - $astro_object_id = $db->sql_fetch_row($astro_id_result)[0] ?? $planet_id; - // Préparer les champs pour la requête d'insertion/mise à jour de la flotte $fleet_fields = []; $fleet_values = []; @@ -666,7 +656,7 @@ $db->sql_query("INSERT INTO " . TABLE_GAME_PLAYER_FLEET . " (astro_object_id, {$fields_str}) VALUES - ({$astro_object_id}, {$values_str}) + ({$planet_id}, {$values_str}) ON DUPLICATE KEY UPDATE " . implode(", ", $update_pairs)); } @@ -689,7 +679,7 @@ $db->sql_query("INSERT INTO " . TABLE_USER_BUILDING . " (id, {$fields_str}) VALUES - ({$astro_object_id}, {$values_str}) + ({$planet_id}, {$values_str}) ON DUPLICATE KEY UPDATE " . implode(", ", $update_prod_pairs)); }