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

fix: no more errors when alliance is in no wars

Browse Source
This commit is contained in:
Martin Ambrus
2017-10-17 13:43:02 +02:00
parent 71dbed0571
commit 49fcd5d983
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Database.php
+24 -18
View File
@@ -1789,15 +1789,18 @@ class MYSQLi_DB {
$q = "SELECT * FROM ".TB_PREFIX."diplomacy WHERE alli1 = '$aid' AND type = '$type' AND accepted = '1' OR alli2 = '$aid' AND type = '$type' AND accepted = '1'"; $q = "SELECT * FROM ".TB_PREFIX."diplomacy WHERE alli1 = '$aid' AND type = '$type' AND accepted = '1' OR alli2 = '$aid' AND type = '$type' AND accepted = '1'";
$array = $this->query_return($q); $array = $this->query_return($q);
$text = ""; $text = "";
foreach($array as $row){
if($row['alli1'] == $aid){ if ($array) {
$alliance = $this->getAlliance($row['alli2']); foreach($array as $row){
}elseif($row['alli2'] == $aid){ if($row['alli1'] == $aid){
$alliance = $this->getAlliance($row['alli1']); $alliance = $this->getAlliance($row['alli2']);
} }elseif($row['alli2'] == $aid){
$text .= ""; $alliance = $this->getAlliance($row['alli1']);
$text .= "<a href=allianz.php?aid=".$alliance['id'].">".$alliance['tag']."</a><br> "; }
} $text .= "";
$text .= "<a href=allianz.php?aid=".$alliance['id'].">".$alliance['tag']."</a><br> ";
}
}
if(strlen($text) == 0){ if(strlen($text) == 0){
$text = "-<br>"; $text = "-<br>";
} }
@@ -1809,15 +1812,18 @@ class MYSQLi_DB {
$q = "SELECT * FROM ".TB_PREFIX."diplomacy WHERE alli1 = '$aid' AND type = '3' OR alli2 = '$aid' AND type = '3' AND accepted = '1'"; $q = "SELECT * FROM ".TB_PREFIX."diplomacy WHERE alli1 = '$aid' AND type = '3' OR alli2 = '$aid' AND type = '3' AND accepted = '1'";
$array = $this->query_return($q); $array = $this->query_return($q);
$text = ""; $text = "";
foreach($array as $row){
if($row['alli1'] == $aid){ if ($array) {
$alliance = $this->getAlliance($row['alli2']); foreach($array as $row){
}elseif($row['alli2'] == $aid){ if($row['alli1'] == $aid){
$alliance = $this->getAlliance($row['alli1']); $alliance = $this->getAlliance($row['alli2']);
} }elseif($row['alli2'] == $aid){
$text .= ""; $alliance = $this->getAlliance($row['alli1']);
$text .= "<a href=allianz.php?aid=".$alliance['id'].">".$alliance['tag']."</a><br> "; }
} $text .= "";
$text .= "<a href=allianz.php?aid=".$alliance['id'].">".$alliance['tag']."</a><br> ";
}
}
if(strlen($text) == 0){ if(strlen($text) == 0){
$text = "-<br>"; $text = "-<br>";
} }