Misc fixes

This commit is contained in:
hondacrx
2021-11-02 13:24:16 -04:00
parent 9edca0bd50
commit 0e1eeba55a
6 changed files with 6 additions and 48 deletions
-1
View File
@@ -659,7 +659,6 @@ namespace Game.Combat
void fillSharedPacketDataAndSend(dynamic packet)
{
packet.UnitGUID = _owner.GetGUID();
packet.ThreatList.reserve(_sortedThreatList.Count);
foreach (ThreatReference refe in _sortedThreatList)
{
+1 -1
View File
@@ -1106,7 +1106,7 @@ namespace Game
break;
default:
Log.outError(LogFilter.Sql, $"{cond.ToString()} Invalid ConditionSourceType in `condition` table, ignoring.");
break;
return false;
}
return true;
+2 -2
View File
@@ -467,8 +467,8 @@ namespace Game.Entities
if (IsCharmed())
RemoveCharmedBy(null);
Cypher.Assert(!GetCharmedGUID().IsEmpty(), $"Unit {GetEntry()} has charmed guid when removed from world");
Cypher.Assert(!GetCharmerGUID().IsEmpty(), $"Unit {GetEntry()} has charmer guid when removed from world");
Cypher.Assert(GetCharmedGUID().IsEmpty(), $"Unit {GetEntry()} has charmed guid when removed from world");
Cypher.Assert(GetCharmerGUID().IsEmpty(), $"Unit {GetEntry()} has charmer guid when removed from world");
Unit owner = GetOwner();
if (owner != null)
+1 -1
View File
@@ -5558,7 +5558,7 @@ namespace Game.Maps
public uint AreaId;
public float FloorZ;
public bool outdoors;
public bool outdoors = true;
public ZLiquidStatus LiquidStatus;
public Optional<AreaInfo> areaInfo;
public Optional<LiquidData> LiquidInfo;
@@ -578,7 +578,7 @@ namespace Game.Networking.Packets
public override void Read()
{
RankID = _worldPacket.ReadInt32();
RankID = _worldPacket.ReadUInt8();
RankOrder = _worldPacket.ReadInt32();
Flags = _worldPacket.ReadUInt32();
WithdrawGoldLimit = _worldPacket.ReadUInt32();
@@ -597,7 +597,7 @@ namespace Game.Networking.Packets
OldFlags = _worldPacket.ReadUInt32();
}
public int RankID;
public byte RankID;
public int RankOrder;
public uint WithdrawGoldLimit;
public uint Flags;