Skip to content

Commit 5b2d1d6

Browse files
committed
Sort housing handler
1 parent fec7757 commit 5b2d1d6

File tree

1 file changed

+92
-91
lines changed

1 file changed

+92
-91
lines changed

WowPacketParserModule.V11_0_0_55666/Parsers/HousingHandler.cs

Lines changed: 92 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,30 @@
55
namespace WowPacketParserModule.V11_0_0_55666.Parsers
66
{
77
public static class HousingHandler
8-
{
9-
[Parser(Opcode.SMSG_HOUSING_FIXTURE_SET_EDITOR_MODE_ACTIVE_RESPONSE)]
10-
public static void HandleHousingFixtureSetEditorModeActiveResponse(Packet packet)
11-
{
12-
packet.ReadPackedGuid128("HouseGUID");
13-
packet.ReadPackedGuid128("BNetAccountGUID");
14-
packet.ReadByteE<HousingResult>("Result");
15-
}
16-
17-
[Parser(Opcode.SMSG_HOUSING_EXTERIOR_SET_EXTERIOR_LOCK_STATE)]
18-
public static void HandleHousingExteriorLockHouseExterior(Packet packet)
19-
{
20-
packet.ReadPackedGuid128("HouseGUID");
21-
packet.ReadPackedGuid128("PlayerGUID");
22-
packet.ReadByteE<HousingResult>("Result");
23-
packet.ReadBit("IsLocked");
24-
}
25-
26-
[Parser(Opcode.SMSG_HOUSING_DECOR_SET_EDITOR_MODE_ACTIVE_RESPONSE)]
27-
public static void HandleHousingDecorSetEditorModeActiveResponse(Packet packet)
28-
{
29-
packet.ReadPackedGuid128("HouseGUID");
30-
packet.ReadPackedGuid128("BNetAccountGUID");
31-
var allowedEditorCount = packet.ReadUInt32("AllowedEditorCount");
32-
packet.ReadByteE<HousingResult>("Result");
33-
34-
for (var i = 0; i < allowedEditorCount; ++i)
35-
packet.ReadPackedGuid128("AllowedEditor", i);
36-
}
8+
{
379

3810
[Parser(Opcode.CMSG_HOUSING_DECOR_CATALOG_CREATE_SEARCHER)]
3911
public static void HousingDecorCatalogCreateSearcher(Packet packet)
4012
{
4113
packet.ReadPackedGuid128("BnetAccountID");
4214
}
4315

44-
[Parser(Opcode.SMSG_HOUSING_DECOR_CATALOG_CREATE_SEARCHER_RESPONSE)]
45-
public static void HousingDecorCatalogCreateSearcherResponse(Packet packet)
16+
[Parser(Opcode.CMSG_HOUSING_DECOR_COMMIT_DYES_FOR_SELECTED_DECOR)]
17+
public static void HousingDecorCommitDyesForSelection(Packet packet)
4618
{
47-
packet.ReadPackedGuid128("BnetAccountID");
48-
packet.ReadByteE<HousingResult>("Result");
19+
packet.ReadPackedGuid128("DecorGUID");
20+
for (var i = 0; i < 3; ++i)
21+
{
22+
packet.ReadInt32("DyeColorID", i);
23+
}
4924
}
5025

26+
[Parser(Opcode.CMSG_HOUSING_DECOR_REMOVE_PLACED_DECOR_ENTRY)]
27+
public static void HousingDecorRemovePlacedEntry(Packet packet)
28+
{
29+
packet.ReadPackedGuid128("DecorGUID");
30+
}
31+
5132
[Parser(Opcode.CMSG_HOUSING_DECOR_SELECT_DECOR)]
5233
public static void HousingDecorSelect(Packet packet)
5334
{
@@ -62,81 +43,112 @@ public static void HousingDecorStartPlacing(Packet packet)
6243
packet.ReadUInt32("Field_4");
6344
}
6445

65-
[Parser(Opcode.CMSG_HOUSING_DECOR_REMOVE_PLACED_DECOR_ENTRY)]
66-
public static void HousingDecorRemovePlacedEntry(Packet packet)
46+
[Parser(Opcode.CMSG_HOUSING_ROOM_REMOVE_ROOM)]
47+
public static void HandleHousingRoomRemove(Packet packet)
6748
{
68-
packet.ReadPackedGuid128("DecorGUID");
49+
packet.ReadPackedGuid128("RoomGUID");
6950
}
7051

71-
[Parser(Opcode.CMSG_HOUSING_DECOR_COMMIT_DYES_FOR_SELECTED_DECOR)]
72-
public static void HousingDecorCommitDyesForSelection(Packet packet)
52+
[Parser(Opcode.CMSG_HOUSING_ROOM_ROTATE_ROOM)]
53+
public static void HousingRoomRotate(Packet packet)
7354
{
74-
packet.ReadPackedGuid128("DecorGUID");
75-
for (var i = 0; i < 3; ++i)
76-
{
77-
packet.ReadInt32("DyeColorID", i);
78-
}
55+
packet.ReadPackedGuid128("RoomGUID");
56+
packet.ReadBool("IsLeft");
57+
}
58+
59+
[Parser(Opcode.CMSG_HOUSING_SERVICES_GET_OTHERS_PLAYER_OWNED_HOUSES)]
60+
public static void HandleHousingServiceGetOthersPlayerOwnedHouses(Packet packet)
61+
{
62+
packet.ReadPackedGuid128("PlayerGUID");
63+
}
64+
65+
[Parser(Opcode.CMSG_HOUSING_SERVICES_SEARCH_BNET_FRIEND_NEIGHBORHOODS)]
66+
public static void HandleHousingServiceSearchBnetFriendNeighborhoods(Packet packet)
67+
{
68+
packet.ReadPackedGuid128("BNetAccountGUID");
7969
}
8070

81-
[Parser(Opcode.SMSG_HOUSING_ROOM_SET_EDITOR_MODE_ACTIVE_RESPONSE)]
82-
public static void HandleHousingRoomSetEditorModeActiveResponse(Packet packet)
71+
[Parser(Opcode.CMSG_NEIGHBORHOOD_INTERACT_WITH_CORNERSTONE)]
72+
public static void HandleNeighborhoodInteractWithCornerstone(Packet packet)
8373
{
84-
packet.ReadPackedGuid128("HouseGUID");
85-
packet.ReadByteE<HousingResult>("Result");
86-
packet.ReadBool("Active");
74+
packet.ReadUInt32("PlotID");
75+
packet.ReadPackedGuid128("CornerstoneGUID");
8776
}
8877

89-
[Parser(Opcode.CMSG_HOUSING_ROOM_REMOVE_ROOM)]
90-
public static void HandleHousingRoomRemove(Packet packet)
78+
[Parser(Opcode.CMSG_QUERY_NEIGHBORHOOD_INFO)]
79+
public static void HandleQueryNeighborhoodInfo(Packet packet)
9180
{
92-
packet.ReadPackedGuid128("RoomGUID");
81+
packet.ReadPackedGuid128("NeighborhoodGUID");
9382
}
9483

95-
[Parser(Opcode.SMSG_HOUSING_ROOM_REMOVE_ROOM_RESPONSE)]
96-
public static void HandleHousingRoomRemoveResponse(Packet packet)
84+
[Parser(Opcode.SMSG_HOUSING_CURRENT_HOUSE_INFO_RESPONSE)]
85+
public static void HandleHousingCurrentHouseInfoResponse(Packet packet)
9786
{
98-
packet.ReadPackedGuid128("RoomGUID");
99-
packet.ReadPackedGuid128("PlayerGUID");
87+
ReadHouse(packet, "House");
10088
packet.ReadByteE<HousingResult>("Result");
10189
}
10290

103-
[Parser(Opcode.CMSG_HOUSING_ROOM_ROTATE_ROOM)]
104-
public static void HousingRoomRotate(Packet packet)
91+
[Parser(Opcode.SMSG_HOUSING_DECOR_CATALOG_CREATE_SEARCHER_RESPONSE)]
92+
public static void HousingDecorCatalogCreateSearcherResponse(Packet packet)
10593
{
106-
packet.ReadPackedGuid128("RoomGUID");
107-
packet.ReadBool("IsLeft");
94+
packet.ReadPackedGuid128("BnetAccountID");
95+
packet.ReadByteE<HousingResult>("Result");
10896
}
10997

110-
[Parser(Opcode.SMSG_HOUSING_ROOM_UPDATE_RESULT)]
111-
public static void HousingRoomUpdateResult(Packet packet)
98+
[Parser(Opcode.SMSG_HOUSING_DECOR_SET_EDITOR_MODE_ACTIVE_RESPONSE)]
99+
public static void HandleHousingDecorSetEditorModeActiveResponse(Packet packet)
112100
{
113-
packet.ReadPackedGuid128("RoomGUID");
101+
packet.ReadPackedGuid128("HouseGUID");
102+
packet.ReadPackedGuid128("BNetAccountGUID");
103+
var allowedEditorCount = packet.ReadUInt32("AllowedEditorCount");
104+
packet.ReadByteE<HousingResult>("Result");
105+
106+
for (var i = 0; i < allowedEditorCount; ++i)
107+
packet.ReadPackedGuid128("AllowedEditor", i);
108+
}
109+
110+
[Parser(Opcode.SMSG_HOUSING_EXTERIOR_SET_EXTERIOR_LOCK_STATE)]
111+
public static void HandleHousingExteriorLockHouseExterior(Packet packet)
112+
{
113+
packet.ReadPackedGuid128("HouseGUID");
114+
packet.ReadPackedGuid128("PlayerGUID");
115+
packet.ReadByteE<HousingResult>("Result");
116+
packet.ReadBit("IsLocked");
117+
}
118+
119+
[Parser(Opcode.SMSG_HOUSING_FIXTURE_SET_EDITOR_MODE_ACTIVE_RESPONSE)]
120+
public static void HandleHousingFixtureSetEditorModeActiveResponse(Packet packet)
121+
{
122+
packet.ReadPackedGuid128("HouseGUID");
123+
packet.ReadPackedGuid128("BNetAccountGUID");
114124
packet.ReadByteE<HousingResult>("Result");
115125
}
116126

117-
[Parser(Opcode.CMSG_HOUSING_DECOR_SET_EDITOR_MODE_ACTIVE)]
118-
[Parser(Opcode.CMSG_HOUSING_FIXTURE_SET_EDITOR_MODE_ACTIVE)]
119-
[Parser(Opcode.CMSG_HOUSING_ROOM_SET_EDITOR_MODE_ACTIVE)]
120-
public static void HandleHousingSetEditorModeActive(Packet packet)
127+
[Parser(Opcode.SMSG_HOUSING_ROOM_REMOVE_ROOM_RESPONSE)]
128+
public static void HandleHousingRoomRemoveResponse(Packet packet)
121129
{
122-
packet.ReadBool("Active");
130+
packet.ReadPackedGuid128("RoomGUID");
131+
packet.ReadPackedGuid128("PlayerGUID");
132+
packet.ReadByteE<HousingResult>("Result");
123133
}
124134

125-
[Parser(Opcode.SMSG_HOUSING_CURRENT_HOUSE_INFO_RESPONSE)]
126-
public static void HandleHousingCurrentHouseInfoResponse(Packet packet)
135+
[Parser(Opcode.SMSG_HOUSING_ROOM_SET_EDITOR_MODE_ACTIVE_RESPONSE)]
136+
public static void HandleHousingRoomSetEditorModeActiveResponse(Packet packet)
127137
{
128-
ReadHouse(packet, "House");
138+
packet.ReadPackedGuid128("HouseGUID");
129139
packet.ReadByteE<HousingResult>("Result");
140+
packet.ReadBool("Active");
130141
}
131142

132-
[Parser(Opcode.CMSG_HOUSING_SERVICES_GET_OTHERS_PLAYER_OWNED_HOUSES)]
133-
public static void HandleHousingServiceGetOthersPlayerOwnedHouses(Packet packet)
143+
[Parser(Opcode.SMSG_HOUSING_ROOM_UPDATE_RESULT)]
144+
public static void HousingRoomUpdateResult(Packet packet)
134145
{
135-
packet.ReadPackedGuid128("PlayerGUID");
146+
packet.ReadPackedGuid128("RoomGUID");
147+
packet.ReadByteE<HousingResult>("Result");
136148
}
137149

138-
[Parser(Opcode.SMSG_HOUSING_SERVICES_GET_PLAYER_OWNED_HOUSES_RESPONSE)]
139150
[Parser(Opcode.SMSG_HOUSING_SERVICES_GET_OTHERS_PLAYER_OWNED_HOUSES_RESPONSE)]
151+
[Parser(Opcode.SMSG_HOUSING_SERVICES_GET_PLAYER_OWNED_HOUSES_RESPONSE)]
140152
public static void HandleHousingServiceGetOwnedHousesResponse(Packet packet)
141153
{
142154
var count = packet.ReadUInt32("Count");
@@ -146,24 +158,12 @@ public static void HandleHousingServiceGetOwnedHousesResponse(Packet packet)
146158
ReadHouse(packet, i);
147159
}
148160
}
149-
150-
[Parser(Opcode.CMSG_HOUSING_SERVICES_SEARCH_BNET_FRIEND_NEIGHBORHOODS)]
151-
public static void HandleHousingServiceSearchBnetFriendNeighborhoods(Packet packet)
152-
{
153-
packet.ReadPackedGuid128("BNetAccountGUID");
154-
}
155161

156162
[Parser(Opcode.SMSG_INVALIDATE_NEIGHBORHOOD_NAME)]
157163
public static void HandleInvalidateNeighborhoodName(Packet packet)
158164
{
159165
packet.ReadPackedGuid128("NeighborhoodGUID");
160166
}
161-
162-
[Parser(Opcode.CMSG_QUERY_NEIGHBORHOOD_INFO)]
163-
public static void HandleQueryNeighborhoodInfo(Packet packet)
164-
{
165-
packet.ReadPackedGuid128("NeighborhoodGUID");
166-
}
167167

168168
[Parser(Opcode.SMSG_QUERY_NEIGHBORHOOD_NAME_RESPONSE)]
169169
public static void HandleQueryNeighborhoodNameResponse(Packet packet)
@@ -173,16 +173,17 @@ public static void HandleQueryNeighborhoodNameResponse(Packet packet)
173173
packet.ReadWoWString("NeighborhoodName", nameLen);
174174
}
175175

176-
[Parser(Opcode.CMSG_NEIGHBORHOOD_INTERACT_WITH_CORNERSTONE)]
177-
public static void HandleNeighborhoodInteractWithCornerstone(Packet packet)
176+
[Parser(Opcode.CMSG_HOUSING_DECOR_SET_EDITOR_MODE_ACTIVE)]
177+
[Parser(Opcode.CMSG_HOUSING_FIXTURE_SET_EDITOR_MODE_ACTIVE)]
178+
[Parser(Opcode.CMSG_HOUSING_ROOM_SET_EDITOR_MODE_ACTIVE)]
179+
public static void HandleHousingSetEditorModeActive(Packet packet)
178180
{
179-
packet.ReadUInt32("PlotID");
180-
packet.ReadPackedGuid128("CornerstoneGUID");
181+
packet.ReadBool("Active");
181182
}
182183

183184
[Parser(Opcode.CMSG_HOUSE_INTERIOR_LEAVE_HOUSE)]
184-
[Parser(Opcode.CMSG_HOUSING_SERVICES_GET_PLAYER_OWNED_HOUSES)]
185185
[Parser(Opcode.CMSG_HOUSING_REQUEST_CURRENT_HOUSE_INFO)]
186+
[Parser(Opcode.CMSG_HOUSING_SERVICES_GET_PLAYER_OWNED_HOUSES)]
186187
[Parser(Opcode.CMSG_HOUSING_SERVICES_HOUSE_FINDER_REQUEST_NEIGHBORHOODS)]
187188
public static void HandleHousingNull(Packet packet)
188189
{

0 commit comments

Comments
 (0)