From 2b61bd72c2d06d68a8fff8b6484d02334a5f9a27 Mon Sep 17 00:00:00 2001
From: novgorodschi catalin <cata7007@gmail.com>
Date: Mon, 7 Sep 2026 11:43:45 +0300
Subject: [PATCH] Some important fixes

Some important fixes
---
 GameEngine/Database/DatabaseUserQueries.php | 2 +-
 Templates/Map/mapviewlarge.tpl              | 8 ++++----
 karte2.php                                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

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)) {
 					</script>
 					<img id="map_navibox" src="img/x.gif" usemap="#map_navibox"/>
 					<map name="map_navibox">
-						<area id="ma_n1p7" href="karte.php?z=<?php echo $generator->getBaseID($x,$yp7) ?>" coords="51,15,73,3,95,15,73,27" shape="poly" title="<?php echo NORTH; ?>"/>
-						<area id="ma_n2p7" href="karte.php?z=<?php echo $generator->getBaseID($xm7,$y) ?>" coords="51,41,73,29,95,41,73,53" shape="poly" title="<?php echo EAST; ?>"/>
-						<area id="ma_n3p7" href="karte.php?z=<?php echo $generator->getBaseID($x,$ym7) ?>" coords="4,41,26,29,48,41,26,53" shape="poly" title="<?php echo SOUTH; ?>"/>
-						<area id="ma_n4p7" href="karte.php?z=<?php echo $generator->getBaseID($xp7,$y) ?>" coords="4,15,26,3,48,15,26,27" shape="poly" title="<?php echo WEST; ?>"/>
+						<area id="ma_n1p7" href="karte2.php?z=<?php echo $generator->getBaseID($x,$yp7) ?>" coords="51,15,73,3,95,15,73,27" shape="poly" title="<?php echo NORTH; ?>"/>
+						<area id="ma_n2p7" href="karte2.php?z=<?php echo $generator->getBaseID($xm7,$y) ?>" coords="51,41,73,29,95,41,73,53" shape="poly" title="<?php echo EAST; ?>"/>
+						<area id="ma_n3p7" href="karte2.php?z=<?php echo $generator->getBaseID($x,$ym7) ?>" coords="4,41,26,29,48,41,26,53" shape="poly" title="<?php echo SOUTH; ?>"/>
+						<area id="ma_n4p7" href="karte2.php?z=<?php echo $generator->getBaseID($xp7,$y) ?>" coords="4,15,26,3,48,15,26,27" shape="poly" title="<?php echo WEST; ?>"/>
 					</map>
 					<div id="map_coords">
 						<form name="map_coords" method="post" >
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){
 	<meta http-equiv="imagetoolbar" content="no" />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<script src="mt-core.js" type="text/javascript"></script>
-	<script src="unx.js?f4b7h type="text/javascript"></script>
+	<script src="unx.js?f4b7h" type="text/javascript"></script>
 	<script src="mt-more.js" type="text/javascript"></script>
 	<link href="<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" />
 	<link href="<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7i" rel="stylesheet" type="text/css" />