Skip to content

Commit 25adc8c

Browse files
authored
Merge pull request #159 from GarwelGarwel/dev
v1.6.1
2 parents c6c0462 + f644371 commit 25adc8c

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

0 Bytes
Binary file not shown.

GameData/KerbalHealth/KerbalHealth.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{
77
"MAJOR": 1,
88
"MINOR": 6,
9-
"PATCH": 0
9+
"PATCH": 1
1010
},
1111
"KSP_VERSION":
1212
{

KerbalHealthStatus.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,11 @@ public void Load(ConfigNode node)
11221122
name = node.GetValue("name");
11231123
hp = node.GetDouble("health", GetDefaultMaxHP(ProtoCrewMember));
11241124
foreach (ConfigNode factorNode in node.GetNodes(HealthFactor.ConfigNodeName))
1125-
factorsOriginal[Core.GetHealthFactor(factorNode.GetValue("name"))] = factorNode.GetDouble("change");
1125+
{
1126+
HealthFactor healthFactor = Core.GetHealthFactor(factorNode.GetValue("name"));
1127+
if (healthFactor != null)
1128+
factorsOriginal[healthFactor] = factorNode.GetDouble("change");
1129+
}
11261130
if (node.HasNode(HealthEffect.ConfigNodeName))
11271131
LocationEffect = new HealthEffect(node.GetNode(HealthEffect.ConfigNodeName));
11281132
Dose = node.GetDouble("dose");

Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("1.6.0")]
37-
[assembly: AssemblyFileVersion("1.6.0")]
36+
[assembly: AssemblyVersion("1.6.1")]
37+
[assembly: AssemblyFileVersion("1.6.1")]
3838
[assembly: NeutralResourcesLanguage("en")]

0 commit comments

Comments
 (0)