Skip to content

Update version to 2.11.3 and refactor astro object ID retrieval in de… #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
darknoon29 merged 1 commit into from
Sep 16, 2025
Merged

Update version to 2.11.3 and refactor astro object ID retrieval in de… #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
16 changes: 3 additions & 13 deletions xtense.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Expand All @@ -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));
}
Expand Down Expand Up @@ -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 = [];
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand Down
Loading