From b4b496828641a8601e26a532ee8f6306fba1f04e Mon Sep 17 00:00:00 2001
From: yi12345 <yarin_din@walla.com>
Date: Tue, 23 Jul 2013 13:25:41 +0300
Subject: [PATCH] update

---
 GameEngine/Database/db_MYSQL.php  | 10 ++++++++--
 GameEngine/Database/db_MYSQLi.php | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index 6a99d0b5..7fd375bf 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -1902,9 +1902,15 @@ class MYSQL_DB {
 		$dbarray = mysql_fetch_array($result);
 		$q = "UPDATE ".TB_PREFIX."bdata SET timestamp = $time WHERE id = '".$dbarray['id']."'";
 		$this->query($q);
-		$q2 = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and loopcon = 1 and field <= 18 order by master,timestamp ASC";
-		if(mysql_num_rows($q2) > 0){
+
+		$tribe = $this->getUserField($this->getVillageField($wid, "owner"), "tribe", 0);
+		if($tribe == 1){
+		$q2 = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and loopcon = 1 and field >= 19 order by master,timestamp ASC";
+		}else{
+		$q2 = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and loopcon = 1 order by master,timestamp ASC";
+		}
 		$result2 = mysql_query($q2);
+		if(mysql_num_rows($result2) > 0){
 		$dbarray2 = mysql_fetch_array($result2);
 		$wc_time = $dbarray['timestamp'];
 		$q2 = "UPDATE ".TB_PREFIX."bdata SET timestamp = timestamp - $wc_time WHERE id = '".$dbarray2['id']."'";
diff --git a/GameEngine/Database/db_MYSQLi.php b/GameEngine/Database/db_MYSQLi.php
index 29d69569..efc97b54 100644
--- a/GameEngine/Database/db_MYSQLi.php
+++ b/GameEngine/Database/db_MYSQLi.php
@@ -1905,9 +1905,15 @@ class MYSQLi_DB {
 		$dbarray = mysqli_fetch_array($result, MYSQLI_BOTH);
 		$q = "UPDATE ".TB_PREFIX."bdata SET timestamp = $time WHERE id = '".$dbarray['id']."'";
 		$this->query($q);
-		$q2 = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and loopcon = 1 and field <= 18 order by master,timestamp ASC";
-		if(mysqli_num_rows($q2) > 0){
+
+		$tribe = $this->getUserField($this->getVillageField($wid, "owner"), "tribe", 0);
+		if($tribe == 1){
+		$q2 = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and loopcon = 1 and field >= 19 order by master,timestamp ASC";
+		}else{
+		$q2 = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and loopcon = 1 order by master,timestamp ASC";
+		}
 		$result2 = mysqli_query($q2);
+		if(mysqli_num_rows($result2) > 0){
 		$dbarray2 = mysql_fetch_array($result2);
 		$wc_time = $dbarray['timestamp'];
 		$q2 = "UPDATE ".TB_PREFIX."bdata SET timestamp = timestamp - $wc_time WHERE id = '".$dbarray2['id']."'";