Skip to content

Commit 6c6aeea

Browse files
83N17083N170
83N170
authored and
83N170
committed
Merge branch 'master' of https://github.com/DFHack/scripts into feature/design_star
2 parents 6b2e4e4 + b5178d6 commit 6c6aeea

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

changelog.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ Template for new versions:
3232

3333
## New Features
3434

35+
## Fixes
36+
37+
## Misc Improvements
38+
39+
## Removed
40+
41+
# 51.11-r1
42+
3543
## Fixes
3644
- `list-agreements`: fix date math when determining petition age
3745
- `gui/petitions`: fix date math when determining petition age
@@ -42,8 +50,6 @@ Template for new versions:
4250
- `fix/loyaltycascade`: now also breaks up brawls and other intra-fort conflicts that *look* like loyalty cascades
4351
- `makeown`: remove selected unit from any current conflicts so they don't just start attacking other citizens when you make them a citizen of your fort
4452

45-
## Removed
46-
4753
# 51.09-r1
4854

4955
## New Features

fix/ownership.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ local zone_vecs = {
3333
local function relink_zones()
3434
for _,zones in ipairs(zone_vecs) do
3535
for _,zone in ipairs(zones) do
36-
local unit = zone.assigned_unit
36+
local unit = dfhack.buildings.getOwner(zone)
3737
if not unit then goto continue end
3838
if not utils.linear_index(unit.owned_buildings, zone.id, 'id') then
3939
print(('fix/ownership: Restoring %s ownership link for %s'):format(

0 commit comments

Comments
 (0)