xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-13 14:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from yi12345/master

Browse Source 
Update
This commit is contained in:
akshay9
2012-10-21 23:19:40 -07:00
parent 56e5256bba 95fc3f0ce6
commit 45fb3d50ee
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+8
View File
@@ -347,6 +347,10 @@ class Automation {
$database->query($q); $database->query($q);
$q = "DELETE FROM ".TB_PREFIX."units where vref =".$village; $q = "DELETE FROM ".TB_PREFIX."units where vref =".$village;
$database->query($q); $database->query($q);
$q = "DELETE FROM ".TB_PREFIX."farmlist where wref =".$village;
$database->query($q);
$q = "DELETE FROM ".TB_PREFIX."raidlist where towref = ".$village;
$database->query($q);
$q = "DELETE FROM ".TB_PREFIX."vdata where wref = ".$village; $q = "DELETE FROM ".TB_PREFIX."vdata where wref = ".$village;
$database->query($q); $database->query($q);
$q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = ".$village; $q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = ".$village;
@@ -2718,6 +2722,10 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
$database->query($q); $database->query($q);
$q = "DELETE FROM ".TB_PREFIX."units where vref =".$data['to']; $q = "DELETE FROM ".TB_PREFIX."units where vref =".$data['to'];
$database->query($q); $database->query($q);
$q = "DELETE FROM ".TB_PREFIX."farmlist where wref =".$village;
$database->query($q);
$q = "DELETE FROM ".TB_PREFIX."raidlist where towref = ".$village;
$database->query($q);
$q = "DELETE FROM ".TB_PREFIX."vdata where wref = ".$data['to']; $q = "DELETE FROM ".TB_PREFIX."vdata where wref = ".$data['to'];
$database->query($q); $database->query($q);
$q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = ".$data['to']; $q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = ".$data['to'];
GameEngine/Database/db_MYSQL.php
+2 -2
View File
@@ -221,7 +221,7 @@ class MYSQL_DB {
} }
function setDeleting($uid, $mode) { function setDeleting($uid, $mode) {
$time = time() + 5 * 3600; $time = time() + 72 * 3600;
if(!$mode) { if(!$mode) {
$q = "INSERT into " . TB_PREFIX . "deleting values ($uid,$time)"; $q = "INSERT into " . TB_PREFIX . "deleting values ($uid,$time)";
} else { } else {
@@ -1320,7 +1320,7 @@ class MYSQL_DB {
} }
function getAllianceWar2($aid){ 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); $result = mysql_query($q, $this->connection);
return $this->mysql_fetch_all($result); return $this->mysql_fetch_all($result);
} }