Skip to content

Commit f6636bf

Browse files
ShaurenShauren
committed
Fix DecorStoragePersistedData and HousingDecorData structures
1 parent 741ccf6 commit f6636bf

File tree

3 files changed

+24
-63
lines changed

3 files changed

+24
-63
lines changed

‎WowPacketParserModule.V11_0_0_55666/Parsers/UpdateFieldsHandler1127.cs‎

Lines changed: 22 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -5928,13 +5928,7 @@ public static IGameObjectAssistActionData ReadCreateGameObjectAssistActionData(P
59285928
data.Time = packet.ReadInt64("Time", indexes);
59295929
data.DelveTier = packet.ReadInt32("DelveTier", indexes);
59305930
data.PlayerName = packet.ReadWoWString("PlayerName", data.PlayerName.Length, indexes);
5931-
if (data.MonsterName.Length > 1)
5932-
{
5933-
data.MonsterName = packet.ReadWoWString("MonsterName", data.MonsterName.Length - 1, indexes);
5934-
packet.ReadByte();
5935-
}
5936-
else
5937-
data.MonsterName = string.Empty;
5931+
data.MonsterName = packet.ReadDynamicString("MonsterName", data.MonsterName.Length, indexes);
59385932
return data;
59395933
}
59405934

@@ -5949,13 +5943,7 @@ public static IGameObjectAssistActionData ReadUpdateGameObjectAssistActionData(P
59495943
data.Time = packet.ReadInt64("Time", indexes);
59505944
data.DelveTier = packet.ReadInt32("DelveTier", indexes);
59515945
data.PlayerName = packet.ReadWoWString("PlayerName", data.PlayerName.Length, indexes);
5952-
if (data.MonsterName.Length > 1)
5953-
{
5954-
data.MonsterName = packet.ReadWoWString("MonsterName", data.MonsterName.Length - 1, indexes);
5955-
packet.ReadByte();
5956-
}
5957-
else
5958-
data.MonsterName = string.Empty;
5946+
data.MonsterName = packet.ReadDynamicString("MonsterName", data.MonsterName.Length, indexes);
59595947
return data;
59605948
}
59615949

@@ -6446,7 +6434,7 @@ public static IForceSetAreaTriggerPositionAndRotation ReadCreateForceSetAreaTrig
64466434
var data = new ForceSetAreaTriggerPositionAndRotation();
64476435
packet.ResetBitReader();
64486436
data.TriggerGUID = packet.ReadPackedGuid128("TriggerGUID", indexes);
6449-
data.Position = packet.ReadVector3("Position", indexes);
6437+
data.Pos = packet.ReadVector3("Pos", indexes);
64506438
data.Rotation = packet.ReadQuaternion("Rotation", indexes);
64516439
return data;
64526440
}
@@ -6456,7 +6444,7 @@ public static IForceSetAreaTriggerPositionAndRotation ReadUpdateForceSetAreaTrig
64566444
var data = new ForceSetAreaTriggerPositionAndRotation();
64576445
packet.ResetBitReader();
64586446
data.TriggerGUID = packet.ReadPackedGuid128("TriggerGUID", indexes);
6459-
data.Position = packet.ReadVector3("Position", indexes);
6447+
data.Pos = packet.ReadVector3("Pos", indexes);
64606448
data.Rotation = packet.ReadQuaternion("Rotation", indexes);
64616449
return data;
64626450
}
@@ -7508,28 +7496,25 @@ public static IDecorStoragePersistedData ReadUpdateDecorStoragePersistedData(Pac
75087496
var data = new DecorStoragePersistedData();
75097497
packet.ResetBitReader();
75107498
var rawChangesMask = new int[1];
7511-
rawChangesMask[0] = (int)packet.ReadBits(4);
7499+
rawChangesMask[0] = (int)packet.ReadBits(3);
75127500
var changesMask = new BitArray(rawChangesMask);
75137501

75147502
var hasDyes = false;
75157503
packet.ResetBitReader();
75167504
if (changesMask[0])
75177505
{
7518-
if (changesMask[1])
7519-
{
7520-
data.HouseGUID = packet.ReadPackedGuid128("HouseGUID", indexes);
7521-
}
7522-
if (changesMask[3])
7523-
{
7524-
data.Field_20 = packet.ReadByte("Field_20", indexes);
7525-
}
7526-
hasDyes = packet.ReadBit("HasDyes", indexes);
7527-
if (changesMask[2])
7506+
data.HouseGUID = packet.ReadPackedGuid128("HouseGUID", indexes);
7507+
}
7508+
if (changesMask[2])
7509+
{
7510+
data.Field_20 = packet.ReadByte("Field_20", indexes);
7511+
}
7512+
hasDyes = packet.ReadBit("HasDyes", indexes);
7513+
if (changesMask[1])
7514+
{
7515+
if (hasDyes)
75287516
{
7529-
if (hasDyes)
7530-
{
7531-
data.Dyes = ReadUpdateDecorStoragePersistedDataDyes(packet, indexes, "Dyes");
7532-
}
7517+
data.Dyes = ReadUpdateDecorStoragePersistedDataDyes(packet, indexes, "Dyes");
75337518
}
75347519
}
75357520
return data;
@@ -7543,7 +7528,7 @@ public override IHousingDecorData ReadCreateHousingDecorData(Packet packet, Upda
75437528
data.DecorGUID = packet.ReadPackedGuid128("DecorGUID", indexes);
75447529
data.AttachParentGUID = packet.ReadPackedGuid128("AttachParentGUID", indexes);
75457530
data.Flags = packet.ReadByte("Flags", indexes);
7546-
data.Field_68 = packet.ReadPackedGuid128("Field_68", indexes);
7531+
data.TargetGameObjectGUID = packet.ReadPackedGuid128("TargetGameObjectGUID", indexes);
75477532
hasPersistedData = packet.ReadBit("HasPersistedData", indexes);
75487533
if (hasPersistedData)
75497534
{
@@ -7578,7 +7563,7 @@ public override IHousingDecorData ReadUpdateHousingDecorData(Packet packet, para
75787563
}
75797564
if (changesMask[5])
75807565
{
7581-
data.Field_68 = packet.ReadPackedGuid128("Field_68", indexes);
7566+
data.TargetGameObjectGUID = packet.ReadPackedGuid128("TargetGameObjectGUID", indexes);
75827567
}
75837568
hasPersistedData = packet.ReadBit("HasPersistedData", indexes);
75847569
if (changesMask[4])
@@ -7969,13 +7954,7 @@ public override INeighborhoodMirrorData ReadCreateNeighborhoodMirrorData(Packet
79697954
data.OwnerGUID = packet.ReadPackedGuid128("OwnerGUID", indexes);
79707955
data.Houses.Resize(packet.ReadUInt32());
79717956
data.Managers.Resize(packet.ReadUInt32());
7972-
if (data.Name.Length > 1)
7973-
{
7974-
data.Name = packet.ReadWoWString("Name", data.Name.Length - 1, indexes);
7975-
packet.ReadByte();
7976-
}
7977-
else
7978-
data.Name = string.Empty;
7957+
data.Name = packet.ReadDynamicString("Name", data.Name.Length, indexes);
79797958
for (var i = 0; i < data.Houses.Count; ++i)
79807959
{
79817960
data.Houses[i] = ReadCreatePlayerHouseInfo(packet, indexes, "Houses", i);
@@ -8043,13 +8022,7 @@ public override INeighborhoodMirrorData ReadUpdateNeighborhoodMirrorData(Packet
80438022
}
80448023
if (changesMask[3])
80458024
{
8046-
if (data.Name.Length > 1)
8047-
{
8048-
data.Name = packet.ReadWoWString("Name", data.Name.Length - 1, indexes);
8049-
packet.ReadByte();
8050-
}
8051-
else
8052-
data.Name = string.Empty;
8025+
data.Name = packet.ReadDynamicString("Name", data.Name.Length, indexes);
80538026
}
80548027
}
80558028
return data;
@@ -8181,13 +8154,7 @@ public static INeighborhoodCharter ReadCreateNeighborhoodCharter(Packet packet,
81818154
data.Signatures[i] = ReadCreateNeighborhoodCharterSignature(packet, indexes, "Signatures", i);
81828155
}
81838156
data.Name = new string('*', (int)packet.ReadBits(8));
8184-
if (data.Name.Length > 1)
8185-
{
8186-
data.Name = packet.ReadWoWString("Name", data.Name.Length - 1, indexes);
8187-
packet.ReadByte();
8188-
}
8189-
else
8190-
data.Name = string.Empty;
8157+
data.Name = packet.ReadDynamicString("Name", data.Name.Length, indexes);
81918158
return data;
81928159
}
81938160

@@ -8204,13 +8171,7 @@ public static INeighborhoodCharter ReadUpdateNeighborhoodCharter(Packet packet,
82048171
}
82058172
packet.ResetBitReader();
82068173
data.Name = new string('*', (int)packet.ReadBits(8));
8207-
if (data.Name.Length > 1)
8208-
{
8209-
data.Name = packet.ReadWoWString("Name", data.Name.Length - 1, indexes);
8210-
packet.ReadByte();
8211-
}
8212-
else
8213-
data.Name = string.Empty;
8174+
data.Name = packet.ReadDynamicString("Name", data.Name.Length, indexes);
82148175
return data;
82158176
}
82168177

‎WowPacketParserModule.V11_0_0_55666/UpdateFields/V11_2_7_64632/ForceSetAreaTriggerPositionAndRotation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace WowPacketParserModule.V11_0_0_55666.UpdateFields.V11_2_7_64632
1212
public class ForceSetAreaTriggerPositionAndRotation : IForceSetAreaTriggerPositionAndRotation
1313
{
1414
public WowGuid TriggerGUID { get; set; }
15-
public Vector3 Position { get; set; }
15+
public Vector3 Pos { get; set; }
1616
public Quaternion Rotation { get; set; }
1717
}
1818
}

‎WowPacketParserModule.V11_0_0_55666/UpdateFields/V11_2_7_64632/HousingDecorData.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class HousingDecorData : IHousingDecorData
1515
public WowGuid AttachParentGUID { get; set; }
1616
public System.Nullable<byte> Flags { get; set; }
1717
public IDecorStoragePersistedData PersistedData { get; set; }
18-
public WowGuid Field_68 { get; set; }
18+
public WowGuid TargetGameObjectGUID { get; set; }
1919
}
2020
}
2121

0 commit comments

Comments
 (0)