epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix CA1868

Browse Source
This commit is contained in:
RoosterDragon
2023-11-15 19:11:25 +00:00
committed by Pavel Penev
parent 2ea2106eca
commit 2996a1ddde
5 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@@ -866,6 +866,9 @@ dotnet_diagnostic.CA1865.severity = suggestion # TODO: Change to warning once us
dotnet_diagnostic.CA1866.severity = suggestion # TODO: Change to warning once using .NET 8 or later. dotnet_diagnostic.CA1866.severity = suggestion # TODO: Change to warning once using .NET 8 or later.
dotnet_diagnostic.CA1867.severity = suggestion # TODO: Change to warning once using .NET 8 or later. dotnet_diagnostic.CA1867.severity = suggestion # TODO: Change to warning once using .NET 8 or later.
# Unnecessary call to 'Contains' for sets.
dotnet_diagnostic.CA1868.severity = suggestion # TODO: Change to warning once using .NET 8 or later.
# Cache and reuse 'JsonSerializerOptions' instances. # Cache and reuse 'JsonSerializerOptions' instances.
dotnet_diagnostic.CA1869.severity = suggestion # TODO: Change to warning once using .NET 8 or later. dotnet_diagnostic.CA1869.severity = suggestion # TODO: Change to warning once using .NET 8 or later.

4
OpenRA.Game/FileSystem/FileSystem.cs
View File

@@ -159,9 +159,7 @@ namespace OpenRA.FileSystem
explicitMounts.Remove(key); explicitMounts.Remove(key);
// Mod packages aren't owned by us, so we shouldn't dispose them // Mod packages aren't owned by us, so we shouldn't dispose them
if (modPackages.Contains(package)) if (!modPackages.Remove(package))
modPackages.Remove(package);
else
package.Dispose(); package.Dispose();
} }
else else

2
OpenRA.Game/Traits/World/ScreenMap.cs
View File

@@ -85,7 +85,6 @@ namespace OpenRA.Traits
public void AddOrUpdate(Player viewer, FrozenActor fa) public void AddOrUpdate(Player viewer, FrozenActor fa)
{ {
if (removeFrozenActors[viewer].Contains(fa))
removeFrozenActors[viewer].Remove(fa); removeFrozenActors[viewer].Remove(fa);
addOrUpdateFrozenActors[viewer].Add(fa); addOrUpdateFrozenActors[viewer].Add(fa);
@@ -98,7 +97,6 @@ namespace OpenRA.Traits
public void AddOrUpdate(Actor a) public void AddOrUpdate(Actor a)
{ {
if (removeActors.Contains(a))
removeActors.Remove(a); removeActors.Remove(a);
addOrUpdateActors.Add(a); addOrUpdateActors.Add(a);

4
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -1163,9 +1163,7 @@ namespace OpenRA.Mods.Common.Server
// Clearing an empty spawn point prevents it from being selected // Clearing an empty spawn point prevents it from being selected
// Clearing a disabled spawn restores it for use // Clearing a disabled spawn restores it for use
if (!server.LobbyInfo.DisabledSpawnPoints.Contains(spawnPoint)) if (!server.LobbyInfo.DisabledSpawnPoints.Add(spawnPoint))
server.LobbyInfo.DisabledSpawnPoints.Add(spawnPoint);
else
server.LobbyInfo.DisabledSpawnPoints.Remove(spawnPoint); server.LobbyInfo.DisabledSpawnPoints.Remove(spawnPoint);
server.SyncLobbyInfo(); server.SyncLobbyInfo();

5
OpenRA.Mods.Common/Traits/DockHost.cs
View File

@@ -104,12 +104,9 @@ namespace OpenRA.Mods.Common.Traits
public virtual void Unreserve(DockClientManager client) public virtual void Unreserve(DockClientManager client)
{ {
if (ReservedDockClients.Contains(client)) if (ReservedDockClients.Remove(client))
{
ReservedDockClients.Remove(client);
client.UnreserveHost(); client.UnreserveHost();
} }
}
public virtual void OnDockStarted(Actor self, Actor clientActor, DockClientManager client) public virtual void OnDockStarted(Actor self, Actor clientActor, DockClientManager client)
{ {