Misc bug fixes

This commit is contained in:
hondacrx
2019-09-11 23:42:27 -04:00
parent 3a3ba9ac2a
commit 7c405230cc
15 changed files with 282 additions and 317 deletions
+1 -1
View File
@@ -1233,7 +1233,7 @@ namespace Game.Entities
data.WriteBytes(buffer);
}
void BuildValuesUpdateWithFlag(ByteBuffer data, UpdateFieldFlag flags, Player target)
public override void BuildValuesUpdateWithFlag(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateMask valuesMask = new UpdateMask(14);
valuesMask.Set((int)TypeId.Item);
@@ -38,6 +38,7 @@ namespace Game.Entities
public void ClearChangesMask<T>(BaseUpdateData<T> updateData)
{
_changesMask.Reset(updateData.Bit);
updateData.ClearChangesMask();
}
public void ClearChangesMask<T, U>(BaseUpdateData<T> updateData, ref UpdateField<U> updateField) where T : new() where U : new()
@@ -341,13 +342,13 @@ namespace Game.Entities
public void ClearChangesMask<U>(UpdateField<U> updateField) where U : new()
{
if (typeof(U).BaseType == typeof(IHasChangesMask))
if (typeof(U).GetInterfaces().Any(x => typeof(IHasChangesMask) == x))
((IHasChangesMask)updateField._value).ClearChangesMask();
}
public void ClearChangesMask<U>(UpdateFieldArray<U> updateField) where U : new()
{
if (typeof(U).BaseType == typeof(IHasChangesMask))
if (typeof(U).GetInterfaces().Any(x => typeof(IHasChangesMask) == x))
{
for (int i = 0; i < updateField.GetSize(); ++i)
((IHasChangesMask)updateField[i]).ClearChangesMask();
@@ -356,7 +357,7 @@ namespace Game.Entities
public void ClearChangesMask<U>(DynamicUpdateField<U> updateField) where U : new()
{
if (typeof(U).BaseType == typeof(IHasChangesMask))
if (typeof(U).GetInterfaces().Any(x => typeof(IHasChangesMask) == x))
{
for (int i = 0; i < updateField.Size(); ++i)
((IHasChangesMask)updateField[i]).ClearChangesMask();
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -738,7 +738,7 @@ namespace Game.Entities
return UpdateFieldFlag.None;
}
void BuildValuesUpdateWithFlag(ByteBuffer data, UpdateFieldFlag flags, Player target)
public virtual void BuildValuesUpdateWithFlag(WorldPacket data, UpdateFieldFlag flags, Player target)
{
data.WriteUInt32(0);
data.WriteUInt32(0);
+1 -2
View File
@@ -186,8 +186,7 @@ namespace Game.Entities
public int NextGroupUpdateSequenceNumber(GroupCategory category)
{
var groupUpdate = m_groupUpdateSequences[(int)category];
return groupUpdate.UpdateSequenceNumber++;
return m_groupUpdateSequences[(int)category].UpdateSequenceNumber++;
}
public bool IsAtGroupRewardDistance(WorldObject pRewardSource)
+1 -1
View File
@@ -7544,7 +7544,7 @@ namespace Game.Entities
data.WriteBytes(buffer);
}
void BuildValuesUpdateWithFlag(WorldPacket data, UpdateFieldFlag flags, Player target)
public override void BuildValuesUpdateWithFlag(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateMask valuesMask = new UpdateMask((int)TypeId.Max);
valuesMask.Set((int)TypeId.Unit);
+8 -4
View File
@@ -21,6 +21,7 @@ using Game.DataStorage;
using Game.Network.Packets;
using System.Collections.Generic;
using System.Text;
using System;
namespace Game.Entities
{
@@ -116,15 +117,18 @@ namespace Game.Entities
public void AppendTaximaskTo(ShowTaxiNodes data, bool all)
{
data.CanLandNodes = new byte[PlayerConst.TaxiMaskSize];
data.CanUseNodes = new byte[PlayerConst.TaxiMaskSize];
if (all)
{
data.CanLandNodes = CliDB.TaxiNodesMask; // all existed nodes
data.CanUseNodes = CliDB.TaxiNodesMask;
Buffer.BlockCopy(CliDB.TaxiNodesMask, 0, data.CanLandNodes, 0, PlayerConst.TaxiMaskSize); // all existed nodes
Buffer.BlockCopy(CliDB.TaxiNodesMask, 0, data.CanLandNodes, 0, PlayerConst.TaxiMaskSize);
}
else
{
data.CanLandNodes = m_taximask; // known nodes
data.CanUseNodes = m_taximask;
Buffer.BlockCopy(m_taximask, 0, data.CanLandNodes, 0, PlayerConst.TaxiMaskSize); // known nodes
Buffer.BlockCopy(m_taximask, 0, data.CanUseNodes, 0, PlayerConst.TaxiMaskSize);
}
}
+1 -1
View File
@@ -2729,7 +2729,7 @@ namespace Game.Entities
data.WriteBytes(buffer);
}
void BuildValuesUpdateWithFlag(WorldPacket data, UpdateFieldFlag flags, Player target)
public override void BuildValuesUpdateWithFlag(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateMask valuesMask = new UpdateMask(14);
valuesMask.Set((int)TypeId.Unit);