Skip to content

Commit 5b908a8

Browse files
authored
Merge pull request #2302 from ajrb/fixTGDBreplacements
Don't override faction id if the replacement id is zero
2 parents 712dd8f + 42fc122 commit 5b908a8

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Assets/Scripts/API/BlocksFile.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,8 @@ private void ReadRmbBlockData(BinaryReader reader, int block)
850850
if (WorldDataReplacement.GetBuildingReplacementData(blocks[block].Name, block, i, out buildingReplacementData))
851851
{
852852
blocks[block].DFBlock.RmbBlock.SubRecords[i] = buildingReplacementData.RmbSubRecord;
853-
blocks[block].DFBlock.RmbBlock.FldHeader.BuildingDataList[i].FactionId = buildingReplacementData.FactionId;
853+
if (buildingReplacementData.FactionId > 0)
854+
blocks[block].DFBlock.RmbBlock.FldHeader.BuildingDataList[i].FactionId = buildingReplacementData.FactionId;
854855
blocks[block].DFBlock.RmbBlock.FldHeader.BuildingDataList[i].BuildingType = (DFLocation.BuildingTypes)buildingReplacementData.BuildingType;
855856
if (buildingReplacementData.Quality > 0)
856857
blocks[block].DFBlock.RmbBlock.FldHeader.BuildingDataList[i].Quality = buildingReplacementData.Quality;

0 commit comments

Comments
 (0)