Merge remote-tracking branch 'upstream/master' into auditobjectmaint

ACEmulator · May 14, 2019 · 4ace970 · 4ace970
2 parents 5d8ab7a + 12ec36e
commit 4ace970
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/Source/ACE.Server/Managers/PlayerManager.cs b/Source/ACE.Server/Managers/PlayerManager.cs
@@ -446,24 +446,22 @@ public static IPlayer FindByGuid(uint guid, out bool isOnline)
         /// <param name="monarch">The monarch of an allegiance</param>
         public static List<IPlayer> FindAllByMonarch(ObjectGuid monarch)
         {
-            IEnumerable<Player> onlinePlayersResult;
-            IEnumerable<OfflinePlayer> offlinePlayersResult;
+            var results = new List<IPlayer>();
 
             playersLock.EnterReadLock();
             try
             {
-                onlinePlayersResult = onlinePlayers.Values.Where(p => p.MonarchId == monarch.Full);
-                offlinePlayersResult = offlinePlayers.Values.Where(p => p.MonarchId == monarch.Full);
+                var onlinePlayersResult = onlinePlayers.Values.Where(p => p.MonarchId == monarch.Full);
+                var offlinePlayersResult = offlinePlayers.Values.Where(p => p.MonarchId == monarch.Full);
+
+                results.AddRange(onlinePlayersResult);
+                results.AddRange(offlinePlayersResult);
             }
             finally
             {
                 playersLock.ExitReadLock();
             }
 
-            var results = new List<IPlayer>();
-            results.AddRange(onlinePlayersResult);
-            results.AddRange(offlinePlayersResult);
-
             return results;
         }