mirror of
https://github.com/claunia/SabreTools.git
synced 2025-12-16 19:14:27 +00:00
Manual revert of 470fc924a0
This commit is contained in:
@@ -27,13 +27,6 @@ namespace SabreTools.DatItems.Formats
|
|||||||
[XmlElement("features")]
|
[XmlElement("features")]
|
||||||
public List<PartFeature> Features { get; set; }
|
public List<PartFeature> Features { get; set; }
|
||||||
|
|
||||||
[JsonProperty("dataAreas", DefaultValueHandling = DefaultValueHandling.Ignore)]
|
|
||||||
[XmlElement("dataAreas")]
|
|
||||||
public List<DataArea> DataAreas { get; set; }
|
|
||||||
|
|
||||||
[JsonIgnore]
|
|
||||||
public bool DataAreasSpecified { get { return DataAreas != null && DataAreas.Count > 0; } }
|
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public bool FeaturesSpecified { get { return Features != null && Features.Count > 0; } }
|
public bool FeaturesSpecified { get { return Features != null && Features.Count > 0; } }
|
||||||
|
|
||||||
@@ -78,7 +71,6 @@ namespace SabreTools.DatItems.Formats
|
|||||||
Name = this.Name,
|
Name = this.Name,
|
||||||
Interface = this.Interface,
|
Interface = this.Interface,
|
||||||
Features = this.Features,
|
Features = this.Features,
|
||||||
DataAreas = this.DataAreas,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,15 +102,6 @@ namespace SabreTools.DatItems.Formats
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the dataareas match
|
|
||||||
if (DataAreasSpecified)
|
|
||||||
{
|
|
||||||
foreach (DataArea dataArea in DataAreas)
|
|
||||||
{
|
|
||||||
match &= newOther.DataAreas.Contains(dataArea);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return match;
|
return match;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user