Fixes loading, *Command system is broke* Will fix in the coming days.
This commit is contained in:
hondacrx
@@ -60,7 +60,7 @@ namespace Framework.Database
|
||||
|
||||
if (!File.Exists(path + fileName))
|
||||
{
|
||||
Log.outError(LogFilter.SqlUpdates, $"File \"{path + fileName}\" is missing, download it from \"http://www.trinitycore.org/f/files/category/1-database/\"" +
|
||||
Log.outError(LogFilter.SqlUpdates, $"File \"{path + fileName}\" is missing, download it from \"https://github.com/TrinityCore/TrinityCore/releases\"" +
|
||||
" and place it in your sql directory.");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
using MySqlConnector;
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Framework.Database
|
||||
{
|
||||
@@ -39,15 +40,68 @@ namespace Framework.Database
|
||||
|
||||
public T Read<T>(int column)
|
||||
{
|
||||
var value = _reader[column];
|
||||
|
||||
if (value == DBNull.Value)
|
||||
if (_reader.IsDBNull(column))
|
||||
return default;
|
||||
|
||||
if (value.GetType() != typeof(T))
|
||||
return (T)Convert.ChangeType(value, typeof(T));//todo remove me when all fields are the right type this is super slow
|
||||
var columnType = _reader.GetFieldType(column);
|
||||
if (columnType == typeof(T))
|
||||
return _reader.GetFieldValue<T>(column);
|
||||
|
||||
return (T)value;
|
||||
switch (Type.GetTypeCode(columnType))
|
||||
{
|
||||
case TypeCode.SByte:
|
||||
{
|
||||
var value = _reader.GetSByte(column);
|
||||
return Unsafe.As<sbyte, T>(ref value);
|
||||
}
|
||||
case TypeCode.Byte:
|
||||
{
|
||||
var value = _reader.GetByte(column);
|
||||
return Unsafe.As<byte, T>(ref value);
|
||||
}
|
||||
case TypeCode.Int16:
|
||||
{
|
||||
var value = _reader.GetInt16(column);
|
||||
return Unsafe.As<short, T>(ref value);
|
||||
}
|
||||
case TypeCode.UInt16:
|
||||
{
|
||||
var value = _reader.GetUInt16(column);
|
||||
return Unsafe.As<ushort, T>(ref value);
|
||||
}
|
||||
case TypeCode.Int32:
|
||||
{
|
||||
var value = _reader.GetInt32(column);
|
||||
return Unsafe.As<int, T>(ref value);
|
||||
}
|
||||
case TypeCode.UInt32:
|
||||
{
|
||||
var value = _reader.GetUInt32(column);
|
||||
return Unsafe.As<uint, T>(ref value);
|
||||
}
|
||||
case TypeCode.Int64:
|
||||
{
|
||||
var value = _reader.GetInt64(column);
|
||||
return Unsafe.As<long, T>(ref value);
|
||||
}
|
||||
case TypeCode.UInt64:
|
||||
{
|
||||
var value = _reader.GetUInt64(column);
|
||||
return Unsafe.As<ulong, T>(ref value);
|
||||
}
|
||||
case TypeCode.Single:
|
||||
{
|
||||
var value = _reader.GetFloat(column);
|
||||
return Unsafe.As<float, T>(ref value);
|
||||
}
|
||||
case TypeCode.Double:
|
||||
{
|
||||
var value = _reader.GetDouble(column);
|
||||
return Unsafe.As<double, T>(ref value);
|
||||
}
|
||||
}
|
||||
|
||||
return default;
|
||||
}
|
||||
|
||||
public T[] ReadValues<T>(int startIndex, int numColumns)
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace Framework.Dynamic
|
||||
_storage = new dynamic[length];
|
||||
}
|
||||
|
||||
public FlagsArray(params T[] parts)
|
||||
public FlagsArray(T[] parts)
|
||||
{
|
||||
_storage = new dynamic[parts.Length];
|
||||
for (var i = 0; i < parts.Length; ++i)
|
||||
@@ -37,65 +37,68 @@ namespace Framework.Dynamic
|
||||
|
||||
public FlagsArray(T[] parts, uint length)
|
||||
{
|
||||
_storage = new dynamic[length];
|
||||
for (var i = 0; i < length && i < parts.Length; ++i)
|
||||
for (var i = 0; i < parts.Length; ++i)
|
||||
_storage[i] = parts[i];
|
||||
}
|
||||
|
||||
public static bool operator <(FlagsArray<T> left, FlagsArray<T> right)
|
||||
{
|
||||
for (var i = left._storage.Length; i > 0; --i)
|
||||
for (int i = (int)left.GetSize(); i > 0; --i)
|
||||
{
|
||||
if ((dynamic)left._storage[i - 1] < right._storage[i - 1])
|
||||
if ((dynamic)left[i - 1] < right[i - 1])
|
||||
return true;
|
||||
else if ((dynamic)left._storage[i - 1] > right._storage[i - 1])
|
||||
else if ((dynamic)left[i - 1] > right[i - 1])
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
public static bool operator >(FlagsArray<T> left, FlagsArray<T> right)
|
||||
{
|
||||
for (var i = left._storage.Length; i > 0; --i)
|
||||
for (int i = (int)left.GetSize(); i > 0; --i)
|
||||
{
|
||||
if ((dynamic)left._storage[i - 1] > right._storage[i - 1])
|
||||
if ((dynamic)left[i - 1] > right[i - 1])
|
||||
return true;
|
||||
else if ((dynamic)left._storage[i - 1] < right._storage[i - 1])
|
||||
else if ((dynamic)left[i - 1] < right[i - 1])
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static FlagArray128 operator &(FlagsArray<T> left, FlagsArray<T> right)
|
||||
public static FlagsArray<T> operator &(FlagsArray<T> left, FlagsArray<T> right)
|
||||
{
|
||||
FlagArray128 fl = new();
|
||||
for (var i = 0; i < left._storage.Length; ++i)
|
||||
fl[i] = left._storage[i] & right._storage[i];
|
||||
FlagsArray<T> fl = new(left.GetSize());
|
||||
for (var i = 0; i < left.GetSize(); ++i)
|
||||
fl[i] = (dynamic)left[i] & right[i];
|
||||
|
||||
return fl;
|
||||
}
|
||||
public static FlagArray128 operator |(FlagsArray<T> left, FlagsArray<T> right)
|
||||
public static FlagsArray<T> operator |(FlagsArray<T> left, FlagsArray<T> right)
|
||||
{
|
||||
FlagArray128 fl = new();
|
||||
for (var i = 0; i < left._storage.Length; ++i)
|
||||
fl[i] = left._storage[i] | right._storage[i];
|
||||
FlagsArray<T> fl = new(left.GetSize());
|
||||
for (var i = 0; i < left.GetSize(); ++i)
|
||||
fl[i] = (dynamic)left[i] | right[i];
|
||||
|
||||
return fl;
|
||||
}
|
||||
public static FlagArray128 operator ^(FlagsArray<T> left, FlagsArray<T> right)
|
||||
public static FlagsArray<T> operator ^(FlagsArray<T> left, FlagsArray<T> right)
|
||||
{
|
||||
FlagArray128 fl = new();
|
||||
for (var i = 0; i < left._storage.Length; ++i)
|
||||
fl[i] = left._storage[i] ^ right._storage[i];
|
||||
FlagsArray<T> fl = new(left.GetSize());
|
||||
for (var i = 0; i < left.GetSize(); ++i)
|
||||
fl[i] = (dynamic)left[i] ^ right[i];
|
||||
return fl;
|
||||
}
|
||||
|
||||
public static implicit operator bool(FlagsArray<T> left)
|
||||
{
|
||||
for (var i = 0; i < left._storage.Length; ++i)
|
||||
if (left._storage[i] != 0)
|
||||
for (var i = 0; i < left.GetSize(); ++i)
|
||||
if ((dynamic)left[i] != 0)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public uint GetSize() => (uint)_storage.Length;
|
||||
|
||||
public T this[int i]
|
||||
{
|
||||
get
|
||||
@@ -111,7 +114,21 @@ namespace Framework.Dynamic
|
||||
|
||||
public class FlagArray128 : FlagsArray<uint>
|
||||
{
|
||||
public FlagArray128(params uint[] parts) : base(parts, 4) { }
|
||||
public FlagArray128(uint p1 = 0, uint p2 = 0, uint p3 = 0, uint p4 = 0) : base(4)
|
||||
{
|
||||
_storage[0] = p1;
|
||||
_storage[1] = p2;
|
||||
_storage[2] = p3;
|
||||
_storage[3] = p4;
|
||||
}
|
||||
|
||||
public FlagArray128(uint[] parts) : base(4)
|
||||
{
|
||||
_storage[0] = parts[0];
|
||||
_storage[1] = parts[1];
|
||||
_storage[2] = parts[2];
|
||||
_storage[3] = parts[3];
|
||||
}
|
||||
|
||||
public bool IsEqual(params uint[] parts)
|
||||
{
|
||||
@@ -132,6 +149,28 @@ namespace Framework.Dynamic
|
||||
for (var i = 0; i < parts.Length; ++i)
|
||||
_storage[i] = parts[i];
|
||||
}
|
||||
|
||||
public static FlagArray128 operator &(FlagArray128 left, FlagArray128 right)
|
||||
{
|
||||
FlagArray128 fl = new();
|
||||
for (var i = 0; i < left._storage.Length; ++i)
|
||||
fl[i] = left._storage[i] & right._storage[i];
|
||||
return fl;
|
||||
}
|
||||
public static FlagArray128 operator |(FlagArray128 left, FlagArray128 right)
|
||||
{
|
||||
FlagArray128 fl = new();
|
||||
for (var i = 0; i < left._storage.Length; ++i)
|
||||
fl[i] = left._storage[i] | right._storage[i];
|
||||
return fl;
|
||||
}
|
||||
public static FlagArray128 operator ^(FlagArray128 left, FlagArray128 right)
|
||||
{
|
||||
FlagArray128 fl = new();
|
||||
for (var i = 0; i < left._storage.Length; ++i)
|
||||
fl[i] = left._storage[i] ^ right._storage[i];
|
||||
return fl;
|
||||
}
|
||||
}
|
||||
|
||||
public class FlaggedArray<T> where T : struct
|
||||
|
||||
Reference in New Issue
Block a user