diff --git a/GameEngine/Database/DatabaseUserQueries.php b/GameEngine/Database/DatabaseUserQueries.php index 2ced213f..e36734c1 100644 --- a/GameEngine/Database/DatabaseUserQueries.php +++ b/GameEngine/Database/DatabaseUserQueries.php @@ -868,7 +868,7 @@ trait DatabaseUserQueries { // 2. INCOMING TROOPS $sql = "SELECT 1 FROM ".TB_PREFIX."movement m JOIN ".TB_PREFIX."vdata v ON v.wref = m.to - WHERE v.owner=? AND m.proc=0 AND m.endtime>? AND m.sort_type IN (3,4) LIMIT 1"; + WHERE v.owner=? AND m.proc=0 AND m.endtime>? AND m.sort_type IN (3,4,5,20,21) LIMIT 1"; if ($exists($sql, [$uid, $now])) $errors[] = "INCOMING_TROOPS"; // 3. REINFORCEMENTS diff --git a/Templates/Map/mapviewlarge.tpl b/Templates/Map/mapviewlarge.tpl index bacca738..7d520bff 100644 --- a/Templates/Map/mapviewlarge.tpl +++ b/Templates/Map/mapviewlarge.tpl @@ -619,10 +619,10 @@ while ($donnees = mysqli_fetch_assoc($result2)) { - - - - + + + +
diff --git a/karte2.php b/karte2.php index 6800fce2..6cd3f58b 100644 --- a/karte2.php +++ b/karte2.php @@ -39,7 +39,7 @@ if($session->plus){ - +