From 133a1c4b5680013555dcc47bc941c91069d4623c Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Sun, 30 Aug 2020 20:28:35 -0700 Subject: [PATCH] Renames buffer writer to fix any conflicts (#204) --- Projects/Server/Guild.cs | 6 +++--- Projects/Server/Item.cs | 6 +++--- Projects/Server/Mobile.cs | 6 +++--- .../{BufferWriter.cs => BufferedFileWriter.cs} | 12 +++--------- Projects/Server/Serialization/ISerializable.cs | 2 +- 5 files changed, 13 insertions(+), 19 deletions(-) rename Projects/Server/Serialization/{BufferWriter.cs => BufferedFileWriter.cs} (96%) diff --git a/Projects/Server/Guild.cs b/Projects/Server/Guild.cs index b80878950..ce378865a 100644 --- a/Projects/Server/Guild.cs +++ b/Projects/Server/Guild.cs @@ -40,14 +40,14 @@ namespace Server.Guilds List.Add(Serial, this); if (Serial + 1 > m_NextID) m_NextID = Serial + 1; - SaveBuffer = new BufferWriter(true); + SaveBuffer = new BufferedFileWriter(true); } protected BaseGuild() { Serial = m_NextID++; List.Add(Serial, this); - SaveBuffer = new BufferWriter(true); + SaveBuffer = new BufferedFileWriter(true); } public abstract string Abbreviation { get; set; } @@ -56,7 +56,7 @@ namespace Server.Guilds public abstract bool Disbanded { get; } public static Dictionary List { get; } = new Dictionary(); - public BufferWriter SaveBuffer { get; } + public BufferedFileWriter SaveBuffer { get; } [CommandProperty(AccessLevel.Counselor)] public Serial Serial { get; } diff --git a/Projects/Server/Item.cs b/Projects/Server/Item.cs index ce4b842d0..27f1bcbb3 100644 --- a/Projects/Server/Item.cs +++ b/Projects/Server/Item.cs @@ -253,7 +253,7 @@ namespace Server TypeRef = World.m_ItemTypes.Count - 1; } - SaveBuffer = new BufferWriter(true); + SaveBuffer = new BufferedFileWriter(true); } public Item(Serial serial) @@ -269,7 +269,7 @@ namespace Server TypeRef = World.m_ItemTypes.Count - 1; } - SaveBuffer = new BufferWriter(true); + SaveBuffer = new BufferedFileWriter(true); } public int TempFlags @@ -794,7 +794,7 @@ namespace Server AddNameProperties(list); } - public BufferWriter SaveBuffer { get; } + public BufferedFileWriter SaveBuffer { get; } [CommandProperty(AccessLevel.Counselor)] public Serial Serial { get; } diff --git a/Projects/Server/Mobile.cs b/Projects/Server/Mobile.cs index d1765068a..dd4916839 100644 --- a/Projects/Server/Mobile.cs +++ b/Projects/Server/Mobile.cs @@ -616,7 +616,7 @@ namespace Server TypeRef = World.m_MobileTypes.Count - 1; } - SaveBuffer = new BufferWriter(true); + SaveBuffer = new BufferedFileWriter(true); } public Mobile() @@ -637,7 +637,7 @@ namespace Server TypeRef = World.m_MobileTypes.Count - 1; } - SaveBuffer = new BufferWriter(true); + SaveBuffer = new BufferedFileWriter(true); } public static bool DragEffects { get; set; } = true; @@ -2528,7 +2528,7 @@ namespace Server AddNameProperties(list); } - public BufferWriter SaveBuffer { get; } + public BufferedFileWriter SaveBuffer { get; } [CommandProperty(AccessLevel.Counselor)] public Serial Serial { get; } diff --git a/Projects/Server/Serialization/BufferWriter.cs b/Projects/Server/Serialization/BufferedFileWriter.cs similarity index 96% rename from Projects/Server/Serialization/BufferWriter.cs rename to Projects/Server/Serialization/BufferedFileWriter.cs index c451dd599..7a9689f9c 100644 --- a/Projects/Server/Serialization/BufferWriter.cs +++ b/Projects/Server/Serialization/BufferedFileWriter.cs @@ -2,19 +2,13 @@ * ModernUO * * Copyright (C) 2019-2020 - ModernUO Development Team * * Email: hi@modernuo.com * - * File: BufferWriter.cs * - * Created: 2019/12/30 - Updated: 2020/01/18 * + * File: BufferedFileWriter.cs * * * * This program is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * * You should have received a copy of the GNU General Public License * * along with this program. If not, see . * *************************************************************************/ @@ -27,7 +21,7 @@ using Server.Guilds; namespace Server { - public class BufferWriter : IGenericWriter + public class BufferedFileWriter : IGenericWriter { private const int LargeByteBufferSize = 256; @@ -41,7 +35,7 @@ namespace Server private int m_Index; private int m_MaxBufferChars; - public BufferWriter(bool prefixStr) + public BufferedFileWriter(bool prefixStr) { m_PrefixStrings = prefixStr; m_Encoding = Utility.UTF8; diff --git a/Projects/Server/Serialization/ISerializable.cs b/Projects/Server/Serialization/ISerializable.cs index 7369d2829..90d31ed07 100644 --- a/Projects/Server/Serialization/ISerializable.cs +++ b/Projects/Server/Serialization/ISerializable.cs @@ -23,7 +23,7 @@ namespace Server { public interface ISerializable { - BufferWriter SaveBuffer { get; } + BufferedFileWriter SaveBuffer { get; } int TypeRef { get; } Serial Serial { get; } void Serialize();