From d1b65697a16c75a3d97d26772eca34aacbab2ea2 Mon Sep 17 00:00:00 2001
From: yi12345 <yarin_din@walla.com>
Date: Tue, 24 Sep 2013 14:17:22 +0300
Subject: [PATCH] update

---
 GameEngine/Database/db_MYSQL.php | 2 +-
 Templates/Build/16_incomming.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index 5ec786a6..05931357 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -2221,7 +2221,7 @@ class MYSQL_DB {
 				$q = "SELECT * FROM " . TB_PREFIX . "movement where " . TB_PREFIX . "movement." . $where . " = $village and sort_type = 5 and proc = 0 ORDER BY endtime ASC";
 				break;
 			case 6:
-				$q = "SELECT * FROM " . TB_PREFIX . "movement," . TB_PREFIX . "odata, " . TB_PREFIX . "attacks where " . TB_PREFIX . "odata.wref = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "attacks.attack_type != 1 and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 3 ORDER BY endtime ASC";
+				$q = "SELECT * FROM " . TB_PREFIX . "movement," . TB_PREFIX . "odata, " . TB_PREFIX . "attacks where " . TB_PREFIX . "odata.wref = $village and " . TB_PREFIX . "movement.to = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "attacks.attack_type != 1 and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 3 ORDER BY endtime ASC";
 				break;
 			case 7:
 				$q = "SELECT * FROM " . TB_PREFIX . "movement where " . TB_PREFIX . "movement." . $where . " = $village and sort_type = 4 and ref = 0 and proc = 0 ORDER BY endtime ASC";
diff --git a/Templates/Build/16_incomming.tpl b/Templates/Build/16_incomming.tpl
index ccaef6ed..9b259db0 100644
--- a/Templates/Build/16_incomming.tpl
+++ b/Templates/Build/16_incomming.tpl
@@ -283,7 +283,7 @@ $timer = $y+1;
                   <tbody class="infos">
 									<tr>
 										<th>Arrival</th>
-										<td colspan="10">
+										<td colspan="'.$colspan.'">
 										<div class="in small"><span id=timer'.$timer.'>'.$generator->getTimeFormat($oasis[$y]['endtime']-time()).'</span> h</div>';
 										    $datetime = $generator->procMtime($oasis[$y]['endtime']);
 										    echo "<div class=\"at small\">";