xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-12 14:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor/sendunitscomplete extract (#176)

Browse Source
This commit is contained in:
Ferywir
2026-06-04 19:51:29 +02:00
committed by GitHub
parent 95df9b9018
commit f89877210f
1 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+49 -19
View File
@@ -890,13 +890,18 @@ class Automation {
return (mysqli_affected_rows($database->dblink) === 1); return (mysqli_affected_rows($database->dblink) === 1);
} }
private function sendunitsComplete() { /**
// PROCESARE ATACURI COMPLETE - functie critica, pastrata 100% compatibila * Fetch all attacks (sort_type 3, not reinforcement) that have arrived by
// Aceasta functie gestioneaza toate atacurile care ajung la destinatie * $time, joined with their attack rows, ordered by arrival.
// Include: batalii, capcane, evaziune erou, distrugere cladiri, cuceriri * Pure behaviour-preserving extraction (refactor for issue #155).
global $bid19, $bid23, $bid34, $u99, $database, $battle, $technology, $units; *
* @param int $time Current timestamp.
* @return array Rows of pending/completed attacks.
*/
private function fetchCompletedAttacks($time) {
global $database;
$time = time(); $time = (int) $time;
$q = " $q = "
SELECT SELECT
`from`, `to`, endtime, ref, ctar1, ctar2, spy, moveid, attack_type, `from`, `to`, endtime, ref, ctar1, ctar2, spy, moveid, attack_type,
@@ -915,22 +920,47 @@ class Automation {
AND AND
endtime < $time endtime < $time
ORDER BY endtime ASC"; ORDER BY endtime ASC";
$dataarray = $database->query_return($q); return $database->query_return($q);
}
/**
* Batch-preload the village / unit / tech data used by sendunitsComplete()
* so the per-attack loop hits the in-request cache instead of querying row
* by row. Pure behaviour-preserving extraction (refactor for issue #155).
*
* @param array $dataarray Completed attacks (each with 'from' and 'to').
*/
private function preloadBattleData(array $dataarray) {
global $database;
$vilIDs = [];
foreach ($dataarray as $data) {
$vilIDs[$data['from']] = true;
$vilIDs[$data['to']] = true;
}
$vilIDs = array_keys($vilIDs);
$database->getProfileVillages($vilIDs, 5);
$database->getUnit($vilIDs);
$database->getEnforceVillage($vilIDs, 0);
$database->getMovement(34, $vilIDs, 1);
$database->getABTech($vilIDs);
}
private function sendunitsComplete() {
// PROCESARE ATACURI COMPLETE - functie critica, pastrata 100% compatibila
// Aceasta functie gestioneaza toate atacurile care ajung la destinatie
// Include: batalii, capcane, evaziune erou, distrugere cladiri, cuceriri
global $bid19, $bid23, $bid34, $u99, $database, $battle, $technology, $units;
$time = time();
$dataarray = $this->fetchCompletedAttacks($time);
$totalattackdead = $data_num = 0; $totalattackdead = $data_num = 0;
if ($dataarray && count($dataarray)) { if ($dataarray && count($dataarray)) {
// preload village data // preload village data (batched) so the per-attack loop hits the
$vilIDs = []; // cache instead of querying row by row
foreach($dataarray as $data) { $this->preloadBattleData($dataarray);
$vilIDs[$data['from']] = true;
$vilIDs[$data['to']] = true;
}
$vilIDs = array_keys($vilIDs);
$database->getProfileVillages($vilIDs, 5);
$database->getUnit($vilIDs);
$database->getEnforceVillage($vilIDs, 0);
$database->getMovement(34, $vilIDs, 1);
$database->getABTech($vilIDs);
// calculate battles // calculate battles
foreach($dataarray as $data) { foreach($dataarray as $data) {