Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #40 from CTD1/Fix-0001865-for-E2 

Bug 1865: largest building or region owner pays for certain empty buildings. Fix for E2,
This commit is contained in:
Enno Rehling 2014-10-18 20:35:51 +02:00
parent e4ab34115b 88b9d3c583
commit c337d3f505
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/economy.c
View File

@ -1039,14 +1039,12 @@ static bool maintain(building * b, bool first)
u = building_owner(b); u = building_owner(b);
if (u == NULL) if (u == NULL)
return false; return false;
/* If the owner is the region owner, check if biggest castle has the dontpay flag */ /* If the owner is the region owner, check if dontpay flag is set for the building where he is in */
if (check_param(global.parameters, "rules.region_owner_pay_building", b->type->_name)) { if (check_param(global.parameters, "rules.region_owner_pay_building", b->type->_name)) {
if (u == building_owner(largestbuilding(r, &cmp_taxes, false))) {
if (fval(u->building, BLD_DONTPAY)) { if (fval(u->building, BLD_DONTPAY)) {
return false; return false;
} }
} }
}
for (c = 0; b->type->maintenance[c].number; ++c) { for (c = 0; b->type->maintenance[c].number; ++c) {
const maintenance *m = b->type->maintenance + c; const maintenance *m = b->type->maintenance + c;
int need = m->number; int need = m->number;