diff --git a/CustomizePlus.GameData/Extensions/ActorIdentifierExtensions.cs b/CustomizePlus.GameData/Extensions/ActorIdentifierExtensions.cs index dd5a713..326e106 100644 --- a/CustomizePlus.GameData/Extensions/ActorIdentifierExtensions.cs +++ b/CustomizePlus.GameData/Extensions/ActorIdentifierExtensions.cs @@ -29,10 +29,15 @@ public static class ActorIdentifierExtensions } /// - /// Matches() method but ignoring ownership for owned objects. + /// Matches() method but ignoring ownership for owned objects or if one of identifiers is NPC while the other one is Owned. /// public static bool MatchesIgnoringOwnership(this ActorIdentifier identifier, ActorIdentifier other) { + //carbuncles and other battle minions + if ((identifier.Type == IdentifierType.Npc && other.Type == IdentifierType.Owned) || + (identifier.Type == IdentifierType.Owned && other.Type == IdentifierType.Npc)) + return PenumbraExtensions.Manager.DataIdEquals(identifier, other); + if (identifier.Type != other.Type) return false;