Formatting FIxes (#58)

Projects/Server/Persistence/BinaryMemoryWriter.cs

@@ -28,10 +28,8 @@ namespace Server
     private MemoryStream stream;
 
     public BinaryMemoryWriter()
-      : base(new MemoryStream(512), true)
-    {
+      : base(new MemoryStream(512), true) =>
       stream = UnderlyingStream as MemoryStream;
-    }
 
     protected override int BufferSize => 512;
 

Projects/Server/Persistence/FileOperations.cs

@@ -52,7 +52,7 @@ namespace Server
         options |= FileOptions.Asynchronous;
 
 #if MONO
-			return new FileStream( path, mode, access, share, BufferSize, options );
+      return new FileStream( path, mode, access, share, BufferSize, options );
 #else
       if (Unbuffered)
         options |= NoBuffering;
@@ -74,10 +74,8 @@ namespace Server
       private SafeFileHandle fileHandle;
 
       public UnbufferedFileStream(SafeFileHandle fileHandle, FileAccess access, int bufferSize, bool isAsync)
-        : base(fileHandle, access, bufferSize, isAsync)
-      {
+        : base(fileHandle, access, bufferSize, isAsync) =>
         this.fileHandle = fileHandle;
-      }
 
       public override void Write(byte[] array, int offset, int count)
       {
@@ -85,10 +83,8 @@ namespace Server
       }
 
       public override IAsyncResult BeginWrite(byte[] array, int offset, int numBytes, AsyncCallback userCallback,
-        object stateObject)
-      {
-        return base.BeginWrite(array, offset, BufferSize, userCallback, stateObject);
-      }
+        object stateObject) =>
+        base.BeginWrite(array, offset, BufferSize, userCallback, stateObject);
 
       protected override void Dispose(bool disposing)
       {

Projects/Server/Persistence/FileQueue.cs

@@ -43,10 +43,7 @@ namespace Server
 
     private object syncRoot;
 
-    static FileQueue()
-    {
-      bufferSize = FileOperations.BufferSize;
-    }
+    static FileQueue() => bufferSize = FileOperations.BufferSize;
 
     public FileQueue(int concurrentWrites, FileCommitCallback callback)
     {

Projects/Server/Persistence/ParallelSaveStrategy.cs

@@ -51,10 +51,7 @@ namespace Server
 
     public override string Name => "Parallel";
 
-    private int GetThreadCount()
-    {
-      return processorCount - 1;
-    }
+    private int GetThreadCount() => processorCount - 1;
 
     public override void Save(bool permitBackgroundWrite)
     {
@@ -249,10 +246,7 @@ namespace Server
         foreach (BaseGuild guild in guilds) yield return guild;
       }
 
-      IEnumerator IEnumerable.GetEnumerator()
-      {
-        throw new NotImplementedException();
-      }
+      IEnumerator IEnumerable.GetEnumerator() => throw new NotImplementedException();
     }
 
     private struct ConsumableEntry

Projects/Server/Persistence/Persistence.cs

@@ -25,19 +25,17 @@ namespace Server
 
       file.Refresh();
 
-      using (FileStream fs = file.OpenWrite())
-      {
-        BinaryFileWriter writer = new BinaryFileWriter(fs, true);
+      using FileStream fs = file.OpenWrite();
+      BinaryFileWriter writer = new BinaryFileWriter(fs, true);
 
-        try
-        {
-          serializer(writer);
-        }
-        finally
-        {
-          writer.Flush();
-          writer.Close();
-        }
+      try
+      {
+        serializer(writer);
+      }
+      finally
+      {
+        writer.Flush();
+        writer.Close();
       }
     }
 
@@ -81,26 +79,24 @@ namespace Server
 
       file.Refresh();
 
-      using (FileStream fs = file.OpenRead())
-      {
-        BinaryFileReader reader = new BinaryFileReader(new BinaryReader(fs));
+      using FileStream fs = file.OpenRead();
+      BinaryFileReader reader = new BinaryFileReader(new BinaryReader(fs));
 
-        try
-        {
-          deserializer(reader);
-        }
-        catch (EndOfStreamException eos)
-        {
-          if (file.Length > 0) Console.WriteLine("[Persistence]: {0}", eos);
-        }
-        catch (Exception e)
-        {
-          Console.WriteLine("[Persistence]: {0}", e);
-        }
-        finally
-        {
-          reader.Close();
-        }
+      try
+      {
+        deserializer(reader);
+      }
+      catch (EndOfStreamException eos)
+      {
+        if (file.Length > 0) Console.WriteLine("[Persistence]: {0}", eos);
+      }
+      catch (Exception e)
+      {
+        Console.WriteLine("[Persistence]: {0}", e);
+      }
+      finally
+      {
+        reader.Close();
       }
     }
   }

Projects/Server/Persistence/QueuedMemoryWriter.cs

@@ -29,10 +29,8 @@ namespace Server
     private List<IndexInfo> _orderedIndexInfo = new List<IndexInfo>();
 
     public QueuedMemoryWriter()
-      : base(new MemoryStream(1024 * 1024), true)
-    {
+      : base(new MemoryStream(1024 * 1024), true) =>
       _memStream = UnderlyingStream as MemoryStream;
-    }
 
     protected override int BufferSize => 512;
 

Projects/Server/Persistence/SequentialFileWriter.cs

@@ -108,15 +108,9 @@ namespace Server
       base.Dispose(disposing);
     }
 
-    public override int Read(byte[] buffer, int offset, int count)
-    {
-      throw new InvalidOperationException();
-    }
+    public override int Read(byte[] buffer, int offset, int count) => throw new InvalidOperationException();
 
-    public override long Seek(long offset, SeekOrigin origin)
-    {
-      throw new InvalidOperationException();
-    }
+    public override long Seek(long offset, SeekOrigin origin) => throw new InvalidOperationException();
 
     public override void SetLength(long value)
     {

Projects/Server/Persistence/StandardSaveStrategy.cs

@@ -36,10 +36,7 @@ namespace Server
 
     private Queue<Item> _decayQueue;
 
-    public StandardSaveStrategy()
-    {
-      _decayQueue = new Queue<Item>();
-    }
+    public StandardSaveStrategy() => _decayQueue = new Queue<Item>();
 
     public override string Name => "Standard";