diff --git a/Dalamud/Console/ConsoleManager.cs b/Dalamud/Console/ConsoleManager.cs
index 1c50c4ad9..5e311981b 100644
--- a/Dalamud/Console/ConsoleManager.cs
+++ b/Dalamud/Console/ConsoleManager.cs
@@ -99,10 +99,7 @@ internal partial class ConsoleManager : IServiceType
ArgumentNullException.ThrowIfNull(name);
ArgumentNullException.ThrowIfNull(alias);
- var target = this.FindEntry(name);
- if (target == null)
- throw new EntryNotFoundException(name);
-
+ var target = this.FindEntry(name) ?? throw new EntryNotFoundException(name);
if (this.FindEntry(alias) != null)
throw new InvalidOperationException($"Entry '{alias}' already exists.");
diff --git a/Dalamud/Interface/Textures/Internal/SharedImmediateTextures/ManifestResourceSharedImmediateTexture.cs b/Dalamud/Interface/Textures/Internal/SharedImmediateTextures/ManifestResourceSharedImmediateTexture.cs
index c95a9b0ad..9e8f0577e 100644
--- a/Dalamud/Interface/Textures/Internal/SharedImmediateTextures/ManifestResourceSharedImmediateTexture.cs
+++ b/Dalamud/Interface/Textures/Internal/SharedImmediateTextures/ManifestResourceSharedImmediateTexture.cs
@@ -36,10 +36,7 @@ internal sealed class ManifestResourceSharedImmediateTexture : SharedImmediateTe
///
protected override async Task CreateTextureAsync(CancellationToken cancellationToken)
{
- await using var stream = this.assembly.GetManifestResourceStream(this.name);
- if (stream is null)
- throw new FileNotFoundException("The resource file could not be found.");
-
+ await using var stream = this.assembly.GetManifestResourceStream(this.name) ?? throw new FileNotFoundException("The resource file could not be found.");
var tm = await Service.GetAsync();
var ms = new MemoryStream(stream.CanSeek ? checked((int)stream.Length) : 0);
await stream.CopyToAsync(ms, cancellationToken);
diff --git a/Dalamud/Plugin/Internal/PluginErrorHandler.cs b/Dalamud/Plugin/Internal/PluginErrorHandler.cs
index b39a9ca1a..13f0bc637 100644
--- a/Dalamud/Plugin/Internal/PluginErrorHandler.cs
+++ b/Dalamud/Plugin/Internal/PluginErrorHandler.cs
@@ -141,10 +141,7 @@ internal class PluginErrorHandler : IServiceType
private static Action CreateInvoker() where TDelegate : Delegate
{
var delegateType = typeof(TDelegate);
- var method = delegateType.GetMethod("Invoke");
- if (method == null)
- throw new InvalidOperationException($"Delegate {delegateType} does not have an Invoke method.");
-
+ var method = delegateType.GetMethod("Invoke") ?? throw new InvalidOperationException($"Delegate {delegateType} does not have an Invoke method.");
var parameters = method.GetParameters();
// Create parameters for the lambda
diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs
index 640ec7e9c..13c69fe94 100644
--- a/Dalamud/Plugin/Internal/PluginManager.cs
+++ b/Dalamud/Plugin/Internal/PluginManager.cs
@@ -1511,11 +1511,7 @@ internal class PluginManager : IInternalDisposableService
JsonConvert.SerializeObject(repoManifest, Formatting.Indented));
// Reload as a local manifest, add some attributes, and save again.
- var tempManifest = LocalPluginManifest.Load(tempManifestFile);
-
- if (tempManifest == null)
- throw new Exception("Plugin had no valid manifest");
-
+ var tempManifest = LocalPluginManifest.Load(tempManifestFile) ?? throw new Exception("Plugin had no valid manifest");
if (tempManifest.InternalName != repoManifest.InternalName)
{
throw new Exception(
diff --git a/Dalamud/Plugin/Internal/Profiles/ProfileManager.cs b/Dalamud/Plugin/Internal/Profiles/ProfileManager.cs
index 1df475f55..460a09207 100644
--- a/Dalamud/Plugin/Internal/Profiles/ProfileManager.cs
+++ b/Dalamud/Plugin/Internal/Profiles/ProfileManager.cs
@@ -151,11 +151,7 @@ internal class ProfileManager : IServiceType
/// The newly cloned profile.
public Profile CloneProfile(Profile toClone)
{
- var newProfile = this.ImportProfile(toClone.Model.SerializeForShare());
- if (newProfile == null)
- throw new Exception("New profile was null while cloning");
-
- return newProfile;
+ return this.ImportProfile(toClone.Model.SerializeForShare()) ?? throw new Exception("New profile was null while cloning");
}
///
diff --git a/Dalamud/Plugin/Internal/Types/PluginRepository.cs b/Dalamud/Plugin/Internal/Types/PluginRepository.cs
index c5e703e4b..bfa5d0276 100644
--- a/Dalamud/Plugin/Internal/Types/PluginRepository.cs
+++ b/Dalamud/Plugin/Internal/Types/PluginRepository.cs
@@ -119,13 +119,7 @@ internal class PluginRepository
response.EnsureSuccessStatusCode();
var data = await response.Content.ReadAsStringAsync();
- var pluginMaster = JsonConvert.DeserializeObject>(data);
-
- if (pluginMaster == null)
- {
- throw new Exception("Deserialized PluginMaster was null.");
- }
-
+ var pluginMaster = JsonConvert.DeserializeObject>(data) ?? throw new Exception("Deserialized PluginMaster was null.");
pluginMaster.Sort((pm1, pm2) => string.Compare(pm1.Name, pm2.Name, StringComparison.Ordinal));
// Set the source for each remote manifest. Allows for checking if is 3rd party.
diff --git a/Dalamud/Service/Service{T}.cs b/Dalamud/Service/Service{T}.cs
index b70a66331..a004d1273 100644
--- a/Dalamud/Service/Service{T}.cs
+++ b/Dalamud/Service/Service{T}.cs
@@ -356,10 +356,7 @@ internal static class Service where T : IServiceType
private static async Task ConstructObject(IReadOnlyCollection