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

Core/Misc: Fixes

Browse Source
This commit is contained in:
hondacrx
2018-08-01 13:33:11 -04:00
parent 8673e7218d
commit 92481d8d9f
7 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Collision/Management/VMapManager.cs
+3 -1
View File
@@ -242,9 +242,10 @@ namespace Game.Collision
WorldModel worldmodel = new WorldModel();
if (!worldmodel.readFile(VMapPath + filename + ".vmo"))
{
Log.outError(LogFilter.Server, "VMapManager: could not load '{0}.vmo'", filename);
Log.outError(LogFilter.Server, "VMapManager: could not load '{0}'", filename);
return null;
}
Log.outDebug(LogFilter.Maps, "VMapManager: loading file '{0}'", filename);
model = new ManagedModel();
model.setModel(worldmodel);
@@ -260,6 +261,7 @@ namespace Game.Collision
{
lock (LoadedModelFilesLock)
{
filename = filename.Replace("\0", "");
var model = iLoadedModelFiles.LookupByKey(filename);
if (model == null)
{
Source/Game/Collision/Models/ModelInstance.cs
+1 -1
View File
@@ -61,8 +61,8 @@ namespace Game.Collision
Vector3 bHigh = reader.Read<Vector3>();
spawn.iBound = new AxisAlignedBox(bLow, bHigh);
}
uint nameLen = reader.ReadUInt32();
uint nameLen = reader.ReadUInt32();
spawn.name = reader.ReadString((int)nameLen);
return true;
}
Source/Game/Network/Packets/QueryPackets.cs
+9 -9
View File
@@ -83,9 +83,9 @@ namespace Game.Network.Packets
if (Allow)
{
_worldPacket.WriteBits(Stats.Title.Length + 1, 11);
_worldPacket.WriteBits(Stats.TitleAlt.Length + 1, 11);
_worldPacket.WriteBits(Stats.CursorName.Length + 1, 6);
_worldPacket.WriteBits(Stats.Title.IsEmpty() ? 0 : Stats.Title.Length + 1, 11);
_worldPacket.WriteBits(Stats.TitleAlt.IsEmpty() ? 0 : Stats.TitleAlt.Length + 1, 11);
_worldPacket.WriteBits(Stats.CursorName.IsEmpty() ? 0 : Stats.CursorName.Length + 1, 6);
_worldPacket.WriteBit(Stats.Leader);
for (var i = 0; i < SharedConst.MaxCreatureNames; ++i)
@@ -124,13 +124,13 @@ namespace Game.Network.Packets
_worldPacket.WriteUInt32(Stats.RequiredExpansion);
_worldPacket.WriteInt32(Stats.VignetteID);
if (!string.IsNullOrEmpty(Stats.Title))
if (!Stats.Title.IsEmpty())
_worldPacket.WriteCString(Stats.Title);
if (!string.IsNullOrEmpty(Stats.TitleAlt))
if (!Stats.TitleAlt.IsEmpty())
_worldPacket.WriteCString(Stats.TitleAlt);
if (!string.IsNullOrEmpty(Stats.CursorName))
if (!Stats.CursorName.IsEmpty())
_worldPacket.WriteCString(Stats.CursorName);
foreach (var questItem in Stats.QuestItems)
@@ -693,9 +693,9 @@ namespace Game.Network.Packets
public class CreatureStats
{
public string Title = "";
public string TitleAlt = "";
public string CursorName = "";
public string Title;
public string TitleAlt;
public string CursorName;
public int CreatureType;
public int CreatureFamily;
public int Classification;