Skip to content

Commit

Permalink
Merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Zzarek committed Dec 30, 2023
1 parent 4bdc3d7 commit e0ae42d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions NebulaPatcher/Patches/Dynamic/UIStatisticsWindow_Patch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ public static void _OnClose_Postfix()

[HarmonyPrefix]
[HarmonyPatch(nameof(UIStatisticsWindow.AddFactoryStatGroup))]
public static bool AddStatGroup_Prefix(int __0, ProductionStatistics ___productionStat)
[SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Original Function Name")]
public static bool AddFactoryStatGroup_Prefix(int _factoryIndex, ProductionStatistics ___productionStat)
{
//Skip when StatisticsDataPacket hasn't arrived yet
return __0 >= 0 && ___productionStat.factoryStatPool[__0] != null;
return _factoryIndex >= 0 && ___productionStat.factoryStatPool[_factoryIndex] != null;
}
}

0 comments on commit e0ae42d

Please sign in to comment.