Skip to content

Commit c079c43

Browse files
ShaurenShauren
committed
Fix parsing housing data in 12.0.5
1 parent e83db18 commit c079c43

11 files changed

Lines changed: 32 additions & 26 deletions

File tree

‎WowPacketParser/Enums/WowCSEntityFragments.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public enum WowCSEntityFragments : int
3131
Tag_MeshObject,
3232
Tag_HouseExteriorPiece,
3333
Tag_HouseExteriorRoot,
34+
Tag_HousingDecorProxyGameObject,
3435
FEntityPosition,
3536
FEntityLocalMatrix,
3637
FEntityWorldMatrix,
@@ -135,6 +136,7 @@ public enum WowCSEntityFragments1127 : int
135136
Tag_MeshObject = 221,
136137
Tag_HouseExteriorPiece = 224,
137138
Tag_HouseExteriorRoot = 225,
139+
Tag_HousingDecorProxyGameObject = 226,
138140
End = 255
139141
}
140142

@@ -291,6 +293,7 @@ public static WowCSEntityFragments ToUniversal(WowCSEntityFragments1127 fragment
291293
WowCSEntityFragments1127.Tag_MeshObject => WowCSEntityFragments.Tag_MeshObject,
292294
WowCSEntityFragments1127.Tag_HouseExteriorPiece => WowCSEntityFragments.Tag_HouseExteriorPiece,
293295
WowCSEntityFragments1127.Tag_HouseExteriorRoot => WowCSEntityFragments.Tag_HouseExteriorRoot,
296+
WowCSEntityFragments1127.Tag_HousingDecorProxyGameObject => WowCSEntityFragments.Tag_HousingDecorProxyGameObject,
294297
_ => throw new ArgumentOutOfRangeException(nameof(fragment), fragment, null)
295298
};
296299
}

‎WowPacketParserModule.V11_0_0_55666/Parsers/UpdateFieldsHandler1127.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8106,7 +8106,7 @@ public static IPlayerMirrorHouse ReadCreatePlayerMirrorHouse(Packet packet, para
81068106
{
81078107
var data = new PlayerMirrorHouse();
81088108
packet.ResetBitReader();
8109-
data.Guid = packet.ReadPackedGuid128("Guid", indexes);
8109+
data.HouseGUID = packet.ReadPackedGuid128("HouseGUID", indexes);
81108110
data.NeighborhoodGUID = packet.ReadPackedGuid128("NeighborhoodGUID", indexes);
81118111
data.Level = packet.ReadUInt32("Level", indexes);
81128112
data.Favor = packet.ReadUInt32("Favor", indexes);
@@ -8118,7 +8118,7 @@ public static IPlayerMirrorHouse ReadUpdatePlayerMirrorHouse(Packet packet, para
81188118
{
81198119
var data = new PlayerMirrorHouse();
81208120
packet.ResetBitReader();
8121-
data.Guid = packet.ReadPackedGuid128("Guid", indexes);
8121+
data.HouseGUID = packet.ReadPackedGuid128("HouseGUID", indexes);
81228122
data.NeighborhoodGUID = packet.ReadPackedGuid128("NeighborhoodGUID", indexes);
81238123
data.Level = packet.ReadUInt32("Level", indexes);
81248124
data.Favor = packet.ReadUInt32("Favor", indexes);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace WowPacketParserModule.V11_0_0_55666.UpdateFields.V11_2_7_64632
1111
[GeneratedCode("UpdateFieldCodeGenerator.Formats.WowPacketParserHandler", "1.0.0.0")]
1212
public class PlayerMirrorHouse : IPlayerMirrorHouse
1313
{
14-
public WowGuid Guid { get; set; }
14+
public WowGuid HouseGUID { get; set; }
1515
public WowGuid NeighborhoodGUID { get; set; }
1616
public uint Level { get; set; }
1717
public uint Favor { get; set; }

‎WowPacketParserModule.V12_0_0_65390/Parsers/UpdateFieldsHandler1200.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8583,7 +8583,7 @@ public static IPlayerMirrorHouse ReadCreatePlayerMirrorHouse(Packet packet, para
85838583
{
85848584
var data = new PlayerMirrorHouse();
85858585
packet.ResetBitReader();
8586-
data.Guid = packet.ReadPackedGuid128("Guid", indexes);
8586+
data.HouseGUID = packet.ReadPackedGuid128("HouseGUID", indexes);
85878587
data.NeighborhoodGUID = packet.ReadPackedGuid128("NeighborhoodGUID", indexes);
85888588
data.Level = packet.ReadUInt32("Level", indexes);
85898589
data.Favor = packet.ReadUInt32("Favor", indexes);
@@ -8598,7 +8598,7 @@ public static IPlayerMirrorHouse ReadUpdatePlayerMirrorHouse(Packet packet, para
85988598
{
85998599
var data = new PlayerMirrorHouse();
86008600
packet.ResetBitReader();
8601-
data.Guid = packet.ReadPackedGuid128("Guid", indexes);
8601+
data.HouseGUID = packet.ReadPackedGuid128("HouseGUID", indexes);
86028602
data.NeighborhoodGUID = packet.ReadPackedGuid128("NeighborhoodGUID", indexes);
86038603
data.Level = packet.ReadUInt32("Level", indexes);
86048604
data.Favor = packet.ReadUInt32("Favor", indexes);

‎WowPacketParserModule.V12_0_0_65390/Parsers/UpdateFieldsHandler1201.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8600,7 +8600,7 @@ public static IPlayerMirrorHouse ReadCreatePlayerMirrorHouse(Packet packet, para
86008600
{
86018601
var data = new PlayerMirrorHouse();
86028602
packet.ResetBitReader();
8603-
data.Guid = packet.ReadPackedGuid128("Guid", indexes);
8603+
data.HouseGUID = packet.ReadPackedGuid128("HouseGUID", indexes);
86048604
data.NeighborhoodGUID = packet.ReadPackedGuid128("NeighborhoodGUID", indexes);
86058605
data.Level = packet.ReadUInt32("Level", indexes);
86068606
data.Favor = packet.ReadUInt32("Favor", indexes);
@@ -8615,7 +8615,7 @@ public static IPlayerMirrorHouse ReadUpdatePlayerMirrorHouse(Packet packet, para
86158615
{
86168616
var data = new PlayerMirrorHouse();
86178617
packet.ResetBitReader();
8618-
data.Guid = packet.ReadPackedGuid128("Guid", indexes);
8618+
data.HouseGUID = packet.ReadPackedGuid128("HouseGUID", indexes);
86198619
data.NeighborhoodGUID = packet.ReadPackedGuid128("NeighborhoodGUID", indexes);
86208620
data.Level = packet.ReadUInt32("Level", indexes);
86218621
data.Favor = packet.ReadUInt32("Favor", indexes);

‎WowPacketParserModule.V12_0_0_65390/Parsers/UpdateFieldsHandler1205.cs‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8354,6 +8354,7 @@ public override IHousingPlayerHouseData ReadCreateHousingPlayerHouseData(Packet
83548354
var data = new HousingPlayerHouseData();
83558355
packet.ResetBitReader();
83568356
data.BnetAccount = packet.ReadPackedGuid128("BnetAccount", indexes);
8357+
data.CosmeticOwner = packet.ReadPackedGuid128("CosmeticOwner", indexes);
83578358
data.PlotIndex = packet.ReadInt32("PlotIndex", indexes);
83588359
data.Level = packet.ReadUInt32("Level", indexes);
83598360
data.Favor = packet.ReadUInt64("Favor", indexes);
@@ -8370,7 +8371,7 @@ public override IHousingPlayerHouseData ReadUpdateHousingPlayerHouseData(Packet
83708371
var data = new HousingPlayerHouseData();
83718372
packet.ResetBitReader();
83728373
var rawChangesMask = new int[1];
8373-
rawChangesMask[0] = (int)packet.ReadBits(10);
8374+
rawChangesMask[0] = (int)packet.ReadBits(11);
83748375
var changesMask = new BitArray(rawChangesMask);
83758376

83768377
packet.ResetBitReader();
@@ -8382,33 +8383,37 @@ public override IHousingPlayerHouseData ReadUpdateHousingPlayerHouseData(Packet
83828383
}
83838384
if (changesMask[2])
83848385
{
8385-
data.PlotIndex = packet.ReadInt32("PlotIndex", indexes);
8386+
data.CosmeticOwner = packet.ReadPackedGuid128("CosmeticOwner", indexes);
83868387
}
83878388
if (changesMask[3])
83888389
{
8389-
data.Level = packet.ReadUInt32("Level", indexes);
8390+
data.PlotIndex = packet.ReadInt32("PlotIndex", indexes);
83908391
}
83918392
if (changesMask[4])
83928393
{
8393-
data.Favor = packet.ReadUInt64("Favor", indexes);
8394+
data.Level = packet.ReadUInt32("Level", indexes);
83948395
}
83958396
if (changesMask[5])
83968397
{
8397-
data.InteriorDecorPlacementBudget = packet.ReadUInt32("InteriorDecorPlacementBudget", indexes);
8398+
data.Favor = packet.ReadUInt64("Favor", indexes);
83988399
}
83998400
if (changesMask[6])
84008401
{
8401-
data.ExteriorDecorPlacementBudget = packet.ReadUInt32("ExteriorDecorPlacementBudget", indexes);
8402+
data.InteriorDecorPlacementBudget = packet.ReadUInt32("InteriorDecorPlacementBudget", indexes);
84028403
}
84038404
if (changesMask[7])
84048405
{
8405-
data.ExteriorFixtureBudget = packet.ReadUInt32("ExteriorFixtureBudget", indexes);
8406+
data.ExteriorDecorPlacementBudget = packet.ReadUInt32("ExteriorDecorPlacementBudget", indexes);
84068407
}
84078408
if (changesMask[8])
84088409
{
8409-
data.RoomPlacementBudget = packet.ReadUInt32("RoomPlacementBudget", indexes);
8410+
data.ExteriorFixtureBudget = packet.ReadUInt32("ExteriorFixtureBudget", indexes);
84108411
}
84118412
if (changesMask[9])
8413+
{
8414+
data.RoomPlacementBudget = packet.ReadUInt32("RoomPlacementBudget", indexes);
8415+
}
8416+
if (changesMask[10])
84128417
{
84138418
data.EntityGUID = packet.ReadPackedGuid128("EntityGUID", indexes);
84148419
}
@@ -8644,12 +8649,11 @@ public static IPlayerMirrorHouse ReadCreatePlayerMirrorHouse(Packet packet, para
86448649
{
86458650
var data = new PlayerMirrorHouse();
86468651
packet.ResetBitReader();
8647-
data.Guid = packet.ReadPackedGuid128("Guid", indexes);
8652+
data.HouseGUID = packet.ReadPackedGuid128("HouseGUID", indexes);
86488653
data.NeighborhoodGUID = packet.ReadPackedGuid128("NeighborhoodGUID", indexes);
86498654
data.Level = packet.ReadUInt32("Level", indexes);
86508655
data.Favor = packet.ReadUInt32("Favor", indexes);
86518656
data.InitiativeFavor = packet.ReadUInt32("InitiativeFavor", indexes);
8652-
data.InitiativeCycleID = packet.ReadInt32("InitiativeCycleID", indexes);
86538657
data.MapID = packet.ReadInt32("MapID", indexes);
86548658
data.PlotID = packet.ReadInt32("PlotID", indexes);
86558659
return data;
@@ -8659,12 +8663,11 @@ public static IPlayerMirrorHouse ReadUpdatePlayerMirrorHouse(Packet packet, para
86598663
{
86608664
var data = new PlayerMirrorHouse();
86618665
packet.ResetBitReader();
8662-
data.Guid = packet.ReadPackedGuid128("Guid", indexes);
8666+
data.HouseGUID = packet.ReadPackedGuid128("HouseGUID", indexes);
86638667
data.NeighborhoodGUID = packet.ReadPackedGuid128("NeighborhoodGUID", indexes);
86648668
data.Level = packet.ReadUInt32("Level", indexes);
86658669
data.Favor = packet.ReadUInt32("Favor", indexes);
86668670
data.InitiativeFavor = packet.ReadUInt32("InitiativeFavor", indexes);
8667-
data.InitiativeCycleID = packet.ReadInt32("InitiativeCycleID", indexes);
86688671
data.MapID = packet.ReadInt32("MapID", indexes);
86698672
data.PlotID = packet.ReadInt32("PlotID", indexes);
86708673
return data;
@@ -8876,15 +8879,15 @@ public override IPlayerHouseInfoComponentData ReadUpdatePlayerHouseInfoComponent
88768879
{
88778880
data.EditorMode = packet.ReadByte("EditorMode", indexes);
88788881
}
8879-
if (changesMask[8])
8882+
if (changesMask[9])
88808883
{
88818884
data.CurrentHouse = packet.ReadPackedGuid128("CurrentHouse", indexes);
88828885
}
88838886
if (changesMask[6])
88848887
{
88858888
data.Charter = ReadUpdateNeighborhoodCharter(packet, indexes, "Charter");
88868889
}
8887-
if (changesMask[9])
8890+
if (changesMask[8])
88888891
{
88898892
data.NeighborhoodOwnershipTransfer = ReadUpdateNeighborhoodOwnershipTransfer(packet, indexes, "NeighborhoodOwnershipTransfer");
88908893
}

‎WowPacketParserModule.V12_0_0_65390/UpdateFields/V12_0_0_65390/PlayerMirrorHouse.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace WowPacketParserModule.V12_0_0_65390.UpdateFields.V12_0_0_65390
1111
[GeneratedCode("UpdateFieldCodeGenerator.Formats.WowPacketParserHandler", "1.0.0.0")]
1212
public class PlayerMirrorHouse : IPlayerMirrorHouse
1313
{
14-
public WowGuid Guid { get; set; }
14+
public WowGuid HouseGUID { get; set; }
1515
public WowGuid NeighborhoodGUID { get; set; }
1616
public uint Level { get; set; }
1717
public uint Favor { get; set; }

‎WowPacketParserModule.V12_0_0_65390/UpdateFields/V12_0_1_65818/PlayerMirrorHouse.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace WowPacketParserModule.V12_0_0_65390.UpdateFields.V12_0_1_65818
1111
[GeneratedCode("UpdateFieldCodeGenerator.Formats.WowPacketParserHandler", "1.0.0.0")]
1212
public class PlayerMirrorHouse : IPlayerMirrorHouse
1313
{
14-
public WowGuid Guid { get; set; }
14+
public WowGuid HouseGUID { get; set; }
1515
public WowGuid NeighborhoodGUID { get; set; }
1616
public uint Level { get; set; }
1717
public uint Favor { get; set; }

‎WowPacketParserModule.V12_0_0_65390/UpdateFields/V12_0_5_66741/HousingPlayerHouseData.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace WowPacketParserModule.V12_0_0_65390.UpdateFields.V12_0_5_66741
1212
public class HousingPlayerHouseData : IHousingPlayerHouseData
1313
{
1414
public WowGuid BnetAccount { get; set; }
15+
public WowGuid CosmeticOwner { get; set; }
1516
public System.Nullable<int> PlotIndex { get; set; }
1617
public System.Nullable<uint> Level { get; set; }
1718
public System.Nullable<ulong> Favor { get; set; }

‎WowPacketParserModule.V12_0_0_65390/UpdateFields/V12_0_5_66741/PlayerHouseInfoComponentData.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public class PlayerHouseInfoComponentData : IPlayerHouseInfoComponentData
1313
{
1414
public INeighborhoodCharter Charter { get; set; }
1515
public System.Nullable<byte> EditorMode { get; set; }
16-
public WowGuid CurrentHouse { get; set; }
1716
public INeighborhoodOwnershipTransfer NeighborhoodOwnershipTransfer { get; set; }
17+
public WowGuid CurrentHouse { get; set; }
1818
public DynamicUpdateField<WowGuid> Field_8 { get; } = new();
1919
public DynamicUpdateField<IPlayerMirrorHouse> Houses { get; } = new();
2020
public DynamicUpdateField<WowGuid> Field_88 { get; } = new();

0 commit comments

Comments
 (0)