Merge branch 'main' into newdiscord

This commit is contained in:
Ske
2021-01-15 10:35:20 +01:00
6 changed files with 27 additions and 9 deletions

View File

@@ -16,7 +16,7 @@ namespace PluralKit.Core
[JsonIgnore] public string ProxyString => $"{Prefix ?? ""}text{Suffix ?? ""}";
public bool IsEmpty => Prefix == null && Suffix == null;
[JsonIgnore] public bool IsEmpty => Prefix == null && Suffix == null;
public bool Equals(ProxyTag other) => Prefix == other.Prefix && Suffix == other.Suffix;
@@ -31,4 +31,4 @@ namespace PluralKit.Core
}
}
}
}
}