xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-28 00:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an artefact bug

Browse Source 
+Fixed a bug that prevented the conquer of an artefact between two
villages of the same owner
This commit is contained in:
iopietro
2018-04-08 21:49:13 +02:00
parent 49a0c1377f
commit a8b474bc01
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Database.php
+13 -12
View File
@@ -7191,22 +7191,23 @@ References: User ID/Message ID, Mode
$size1 = $size2 = $size3 = 0;
$artifact = $this->getOwnArtefactInfo( $from );
if ( ! empty( $artifact ) ) {
if (!empty($artifact)) {
$form->addError( "error", "Treasury is full. Your hero could not claim the artefact" );
return false;
}
$uid = $session->uid;
$q = "
SELECT Count(size) AS totals,
SUM(IF(size = '1',1,0)) small,
SUM(IF(size = '2',1,0)) great,
SUM(IF(size = '3',1,0)) `unique`
FROM " . TB_PREFIX . "artefacts WHERE owner = " . (int) $uid;
$result = mysqli_query( $this->dblink, $q );
$uid = $this->getVillageField($from, "owner");
$vuid = $this->getVillageField($vref, "owner");
$q = "SELECT Count(size) AS totals,
SUM(IF(size = '1',1,0)) small,
SUM(IF(size = '2',1,0)) great,
SUM(IF(size = '3',1,0)) `unique`
FROM " . TB_PREFIX . "artefacts WHERE owner = " . (int) $uid;
$result = mysqli_query( $this->dblink, $q );
$artifact = $this->mysqli_fetch_all( $result )[0];
if ( $artifact['totals'] < 3 || $type == 11 ) {
if ( $artifact['totals'] < 3 || $type == 11 || $uid == $vuid) {
$DefenderFields = $this->getResourceLevel( $vref );
$defcanclaim = true;
@@ -7242,7 +7243,7 @@ References: User ID/Message ID, Mode
}
}
if ( ( $artifact['great'] > 0 || $artifact['unique'] > 0 ) && $size > 1 ) {
if (($artifact['great'] > 0 || $artifact['unique'] > 0) && $size > 1 && $uid != $vuid) {
$form->addError( "error", "Max num. of great/unique artefacts. Your hero could not claim the artefact" );
return false;
}