Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: Some cleanups

Browse Source
This commit is contained in:
hondacrx
2018-03-05 12:13:45 -05:00
parent 3fc07b8b37
commit 7de76148b6
9 changed files with 58 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Collections/MultiMap.cs
+4 -4
View File
@@ -119,7 +119,7 @@ namespace System.Collections.Generic
public List<TValue> LookupByKey(TKey key)
{
if (_interalStorage.ContainsKey(key))
return _interalStorage[key].ToList();
return _interalStorage[key];
return new List<TValue>();
}
@@ -128,7 +128,7 @@ namespace System.Collections.Generic
{
TKey newkey = (TKey)Convert.ChangeType(key, typeof(TKey));
if (_interalStorage.ContainsKey(newkey))
return _interalStorage[newkey].ToList();
return _interalStorage[newkey];
return new List<TValue>();
}
@@ -363,7 +363,7 @@ namespace System.Collections.Generic
public List<TValue> LookupByKey(TKey key)
{
if (_interalStorage.ContainsKey(key))
return _interalStorage[key].ToList();
return _interalStorage[key];
return new List<TValue>();
}
@@ -372,7 +372,7 @@ namespace System.Collections.Generic
{
TKey newkey = (TKey)Convert.ChangeType(key, typeof(TKey));
if (_interalStorage.ContainsKey(newkey))
return _interalStorage[newkey].ToList();
return _interalStorage[newkey];
return new List<TValue>();
}
Source/Framework/Realm/RealmManager.cs
+2 -2
View File
@@ -61,7 +61,7 @@ public class RealmManager : Singleton<RealmManager>
SQLResult result = DB.Login.Query(stmt);
Dictionary<RealmHandle, string> existingRealms = new Dictionary<RealmHandle, string>();
foreach (var p in _realms.ToList())
foreach (var p in _realms)
existingRealms[p.Key] = p.Value.Name;
_realms.Clear();
@@ -211,7 +211,7 @@ public class RealmManager : Singleton<RealmManager>
public byte[] GetRealmList(uint build, string subRegion)
{
var realmList = new RealmListUpdates();
foreach (var realm in _realms.ToList())
foreach (var realm in _realms)
{
if (realm.Value.Id.GetSubRegionAddress() != subRegion)
continue;
Source/Framework/Util/Extensions.cs
+1 -84
View File
@@ -15,17 +15,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using Framework.IO;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Linq.Expressions;
using System.Numerics;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions;
using Framework.IO;
namespace System
{
@@ -338,20 +337,6 @@ namespace System
return new string(reader.ReadChars(count));
}
public static byte[] ToByteArray(this BinaryReader reader)
{
var data = new byte[reader.BaseStream.Length];
long pos = reader.BaseStream.Position;
reader.BaseStream.Seek(0, SeekOrigin.Begin);
for (int i = 0; i < data.Length; i++)
data[i] = (byte)reader.BaseStream.ReadByte();
reader.BaseStream.Seek(pos, SeekOrigin.Begin);
return data;
}
public static T[] ReadArray<T>(this BinaryReader reader, int size) where T : struct
{
int numBytes = FastStruct<T>.Size * size;
@@ -374,74 +359,6 @@ namespace System
return FastStruct<T>.ArrayToStructure(result);
}
public static int ReadInt32(this BinaryReader br, int byteCount = 0)
{
if (byteCount == 0)
return br.ReadInt32();
if (byteCount != 4)
{
}
byte[] b = new byte[sizeof(int)];
for (int i = 0; i < byteCount; i++)
b[i] = br.ReadByte();
return BitConverter.ToInt32(b, 0);
}
public static uint ReadUInt32(this BinaryReader br, int byteCount = 0)
{
if (byteCount == 0)
return br.ReadUInt32();
if (byteCount != 4)
{
}
byte[] b = new byte[sizeof(uint)];
for (int i = 0; i < byteCount; i++)
b[i] = br.ReadByte();
return BitConverter.ToUInt32(b, 0);
}
public static long ReadInt64(this BinaryReader br, int byteCount = 0)
{
if (byteCount == 0)
return br.ReadInt64();
if (byteCount != 8)
{
}
byte[] b = new byte[sizeof(long)];
for (int i = 0; i < byteCount; i++)
b[i] = br.ReadByte();
return BitConverter.ToInt64(b, 0);
}
public static ulong ReadUInt64(this BinaryReader br, int byteCount = 0)
{
if (byteCount == 0)
return br.ReadUInt64();
if (byteCount != 8)
{
}
byte[] b = new byte[sizeof(ulong)];
for (int i = 0; i < byteCount; i++)
b[i] = br.ReadByte();
return BitConverter.ToUInt64(b, 0);
}
#endregion
}
}