Core/Misc: Cleanups
This commit is contained in:
@@ -137,10 +137,6 @@ namespace Game.DataStorage
|
|||||||
{
|
{
|
||||||
var val = ((bitSize + 7) / 8);
|
var val = ((bitSize + 7) / 8);
|
||||||
var val1 = NextPow2((bitSize + 7) / 8);
|
var val1 = NextPow2((bitSize + 7) / 8);
|
||||||
if (val != val1)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
byte[] data = new byte[NextPow2((bitSize + 7) / 8)];
|
byte[] data = new byte[NextPow2((bitSize + 7) / 8)];
|
||||||
unsafe
|
unsafe
|
||||||
|
|||||||
@@ -1537,18 +1537,18 @@ namespace Game.Entities
|
|||||||
Player playerMover = GetPlayerBeingMoved();
|
Player playerMover = GetPlayerBeingMoved();
|
||||||
if (playerMover)
|
if (playerMover)
|
||||||
{
|
{
|
||||||
MoveTeleport moveTeleport = new MoveTeleport();
|
float x, y, z, o;
|
||||||
moveTeleport.MoverGUID = GetGUID();
|
pos.GetPosition(out x, out y, out z, out o);
|
||||||
moveTeleport.Pos = pos;
|
|
||||||
|
|
||||||
ITransport transportBase = GetDirectTransport();
|
ITransport transportBase = GetDirectTransport();
|
||||||
if (transportBase != null)
|
if (transportBase != null)
|
||||||
{
|
transportBase.CalculatePassengerOffset(ref x, ref y, ref z, ref o);
|
||||||
float o = 0f;
|
|
||||||
transportBase.CalculatePassengerOffset(ref moveTeleport.Pos.posX, ref moveTeleport.Pos.posY, ref moveTeleport.Pos.posZ, ref o);
|
MoveTeleport moveTeleport = new MoveTeleport();
|
||||||
}
|
moveTeleport.MoverGUID = GetGUID();
|
||||||
|
moveTeleport.Pos = new Position(x, y, z, o);
|
||||||
moveTeleport.TransportGUID.Set(GetTransGUID());
|
moveTeleport.TransportGUID.Set(GetTransGUID());
|
||||||
moveTeleport.Facing = pos.GetOrientation();
|
moveTeleport.Facing = o;
|
||||||
moveTeleport.SequenceIndex = m_movementCounter++;
|
moveTeleport.SequenceIndex = m_movementCounter++;
|
||||||
playerMover.SendPacket(moveTeleport);
|
playerMover.SendPacket(moveTeleport);
|
||||||
|
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ namespace Game.Maps
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (goInfo.MoTransport.taxiPathID >= CliDB.TaxiPathNodesByPath.Keys.Max())
|
if (!CliDB.TaxiPathNodesByPath.ContainsKey(goInfo.MoTransport.taxiPathID))
|
||||||
{
|
{
|
||||||
Log.outError(LogFilter.Sql, "Transport {0} (name: {1}) has an invalid path specified in `gameobject_template`.`data0` ({2}) field, skipped.", entry, goInfo.name, goInfo.MoTransport.taxiPathID);
|
Log.outError(LogFilter.Sql, "Transport {0} (name: {1}) has an invalid path specified in `gameobject_template`.`data0` ({2}) field, skipped.", entry, goInfo.name, goInfo.MoTransport.taxiPathID);
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -186,6 +186,7 @@ namespace WorldServer
|
|||||||
static void ExitNow()
|
static void ExitNow()
|
||||||
{
|
{
|
||||||
Log.outInfo(LogFilter.Server, "Halting process...");
|
Log.outInfo(LogFilter.Server, "Halting process...");
|
||||||
|
Thread.Sleep(5000);
|
||||||
Environment.Exit(-1);
|
Environment.Exit(-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,18 +42,18 @@ LoginDatabaseInfo.Username = "username"
|
|||||||
LoginDatabaseInfo.Password = "password"
|
LoginDatabaseInfo.Password = "password"
|
||||||
LoginDatabaseInfo.Database = "auth"
|
LoginDatabaseInfo.Database = "auth"
|
||||||
|
|
||||||
WorldDatabaseInfo.Host = "127.0.0.1"
|
|
||||||
WorldDatabaseInfo.Port = "3306"
|
|
||||||
WorldDatabaseInfo.Username = "username"
|
|
||||||
WorldDatabaseInfo.Password = "password"
|
|
||||||
WorldDatabaseInfo.Database = "world"
|
|
||||||
|
|
||||||
CharacterDatabaseInfo.Host = "127.0.0.1"
|
CharacterDatabaseInfo.Host = "127.0.0.1"
|
||||||
CharacterDatabaseInfo.Port = "3306"
|
CharacterDatabaseInfo.Port = "3306"
|
||||||
CharacterDatabaseInfo.Username = "username"
|
CharacterDatabaseInfo.Username = "username"
|
||||||
CharacterDatabaseInfo.Password = "password"
|
CharacterDatabaseInfo.Password = "password"
|
||||||
CharacterDatabaseInfo.Database = "characters"
|
CharacterDatabaseInfo.Database = "characters"
|
||||||
|
|
||||||
|
WorldDatabaseInfo.Host = "127.0.0.1"
|
||||||
|
WorldDatabaseInfo.Port = "3306"
|
||||||
|
WorldDatabaseInfo.Username = "username"
|
||||||
|
WorldDatabaseInfo.Password = "password"
|
||||||
|
WorldDatabaseInfo.Database = "world"
|
||||||
|
|
||||||
HotfixDatabaseInfo.Host = "127.0.0.1"
|
HotfixDatabaseInfo.Host = "127.0.0.1"
|
||||||
HotfixDatabaseInfo.Port = "3306"
|
HotfixDatabaseInfo.Port = "3306"
|
||||||
HotfixDatabaseInfo.Username = "username"
|
HotfixDatabaseInfo.Username = "username"
|
||||||
|
|||||||
Reference in New Issue
Block a user