fix: residence and palace being built together check did not always work

This commit is contained in:
Martin Ambrus
2017-11-26 14:23:01 +01:00
parent 43b7e6c9b0
commit ec81cb70b8
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -45,13 +45,13 @@ class Building {
public function residenceOfPalaceBuildInProgress() { public function residenceOfPalaceBuildInProgress() {
global $database, $village; global $database, $village;
$residenceOrPalaceInProgress = $database->getBuildingByType($village->resarray, '25, 26'); $residenceOrPalaceInProgress = $database->getBuildingByType2($village->wid, '25, 26');
$residenceBuildInProgress = false; $residenceBuildInProgress = false;
$palaceBuildInProgress = false; $palaceBuildInProgress = false;
if (count($residenceOrPalaceInProgress)) { if (count($residenceOrPalaceInProgress)) {
foreach ($residenceOrPalaceInProgress as $record) { foreach ($residenceOrPalaceInProgress as $record) {
if ($record['type'] == 25) { if ($record == 25) {
$residenceBuildInProgress = true; $residenceBuildInProgress = true;
} else { } else {
$palaceBuildInProgress = true; $palaceBuildInProgress = true;
+1 -1
View File
@@ -5061,7 +5061,7 @@ References: User ID/Message ID, Mode
$wid = (int) $wid; $wid = (int) $wid;
if (!is_array($type)) { if (!is_array($type)) {
$type = [(int) $type]; $type = [$type];
} else { } else {
foreach ($type as $index => $typeValue) { foreach ($type as $index => $typeValue) {
$type[$index] = (int) $typeValue; $type[$index] = (int) $typeValue;