From beb73780354579aa5ce6056f05d26e0ec1a58e0a Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Sun, 21 Oct 2012 20:15:01 +0200
Subject: [PATCH] update

---
 GameEngine/Database/db_MYSQL.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index 3589d8b2..880fc363 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -221,7 +221,7 @@ class MYSQL_DB {
 	}
 
 	function setDeleting($uid, $mode) {
-		$time = time() + 5 * 3600;
+		$time = time() + 72 * 3600;
 		if(!$mode) {
 			$q = "INSERT into " . TB_PREFIX . "deleting values ($uid,$time)";
 		} else {
@@ -1320,7 +1320,7 @@ class MYSQL_DB {
 	}
 
 	function getAllianceWar2($aid){
-		$q = "SELECT * FROM ".TB_PREFIX."diplomacy WHERE alli2 = '$aid' or alli1 = '$aid' AND accepted = '1'";
+		$q = "SELECT * FROM ".TB_PREFIX."diplomacy WHERE alli1 = '$aid' AND type = '3' OR alli2 = '$aid' AND type = '3' AND accepted = '1'";
 		$result = mysql_query($q, $this->connection);
 		return $this->mysql_fetch_all($result);
 	}