Skip to content

Commit 4e8fa3b

Browse files
committed
Update generated updatefield code after generator changes 2
1 parent 97ec2a4 commit 4e8fa3b

File tree

8 files changed

+43
-22
lines changed

8 files changed

+43
-22
lines changed

WowPacketParser/Store/Objects/UpdateFields/IAreaTriggerPolygon.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public interface IAreaTriggerPolygon
66
{
77
float? Height { get; }
88
float? HeightTarget { get; }
9-
DynamicUpdateField<Vector2> Vertices { get; }
10-
DynamicUpdateField<Vector2> VerticesTarget { get; }
9+
DynamicUpdateField<Vector2?> Vertices { get; }
10+
DynamicUpdateField<Vector2?> VerticesTarget { get; }
1111
}
1212
}

WowPacketParserModule.V11_0_0_55666/Parsers/UpdateHandler.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,20 +402,27 @@ private static void ReadCreateObjectBlock(Packet packet, CreateObject createObje
402402

403403
for (var i = 0; i < createProperties.AreaTriggerData.Polygon.Vertices.Count; ++i)
404404
{
405+
var vertex = createProperties.AreaTriggerData.Polygon.Vertices[i];
406+
if (!vertex.HasValue)
407+
continue;
408+
405409
verticesList.Add(new AreaTriggerCreatePropertiesPolygonVertex
406410
{
407411
areatriggerGuid = guid,
408412
Idx = (uint)i,
409-
VerticeX = createProperties.AreaTriggerData.Polygon.Vertices[i].X,
410-
VerticeY = createProperties.AreaTriggerData.Polygon.Vertices[i].Y
413+
VerticeX = vertex.Value.X,
414+
VerticeY = vertex.Value.Y
411415
});
412416
}
413417

414418
for (var i = 0; i < createProperties.AreaTriggerData.Polygon.VerticesTarget.Count; ++i)
415419
{
416420
var vertexTarget = createProperties.AreaTriggerData.Polygon.VerticesTarget[i];
417-
verticesList[i].VerticeTargetX = vertexTarget.X;
418-
verticesList[i].VerticeTargetY = vertexTarget.Y;
421+
if (!vertexTarget.HasValue)
422+
continue;
423+
424+
verticesList[i].VerticeTargetX = vertexTarget.Value.X;
425+
verticesList[i].VerticeTargetY = vertexTarget.Value.Y;
419426
}
420427

421428
foreach (var vertice in verticesList)

WowPacketParserModule.V11_0_0_55666/UpdateFields/V11_2_0_62213/AreaTriggerPolygon.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public class AreaTriggerPolygon : IAreaTriggerPolygon
1313
{
1414
public System.Nullable<float> Height { get; set; }
1515
public System.Nullable<float> HeightTarget { get; set; }
16-
public DynamicUpdateField<Vector2> Vertices { get; } = new DynamicUpdateField<Vector2>();
17-
public DynamicUpdateField<Vector2> VerticesTarget { get; } = new DynamicUpdateField<Vector2>();
16+
public DynamicUpdateField<System.Nullable<Vector2>> Vertices { get; } = new DynamicUpdateField<System.Nullable<Vector2>>();
17+
public DynamicUpdateField<System.Nullable<Vector2>> VerticesTarget { get; } = new DynamicUpdateField<System.Nullable<Vector2>>();
1818
}
1919
}
2020

WowPacketParserModule.V11_0_0_55666/UpdateFields/V11_2_5_63506/AreaTriggerPolygon.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public class AreaTriggerPolygon : IAreaTriggerPolygon
1313
{
1414
public System.Nullable<float> Height { get; set; }
1515
public System.Nullable<float> HeightTarget { get; set; }
16-
public DynamicUpdateField<Vector2> Vertices { get; } = new DynamicUpdateField<Vector2>();
17-
public DynamicUpdateField<Vector2> VerticesTarget { get; } = new DynamicUpdateField<Vector2>();
16+
public DynamicUpdateField<System.Nullable<Vector2>> Vertices { get; } = new DynamicUpdateField<System.Nullable<Vector2>>();
17+
public DynamicUpdateField<System.Nullable<Vector2>> VerticesTarget { get; } = new DynamicUpdateField<System.Nullable<Vector2>>();
1818
}
1919
}
2020

WowPacketParserModule.V5_5_0_61735/Parsers/UpdateHandler.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,20 +355,27 @@ private static void ReadCreateObjectBlock(Packet packet, CreateObject createObje
355355

356356
for (var i = 0; i < createProperties.AreaTriggerData.Polygon.Vertices.Count; ++i)
357357
{
358+
var vertex = createProperties.AreaTriggerData.Polygon.Vertices[i];
359+
if (!vertex.HasValue)
360+
continue;
361+
358362
verticesList.Add(new AreaTriggerCreatePropertiesPolygonVertex
359363
{
360364
areatriggerGuid = guid,
361365
Idx = (uint)i,
362-
VerticeX = createProperties.AreaTriggerData.Polygon.Vertices[i].X,
363-
VerticeY = createProperties.AreaTriggerData.Polygon.Vertices[i].Y
366+
VerticeX = vertex.Value.X,
367+
VerticeY = vertex.Value.Y
364368
});
365369
}
366370

367371
for (var i = 0; i < createProperties.AreaTriggerData.Polygon.VerticesTarget.Count; ++i)
368372
{
369373
var vertexTarget = createProperties.AreaTriggerData.Polygon.VerticesTarget[i];
370-
verticesList[i].VerticeTargetX = vertexTarget.X;
371-
verticesList[i].VerticeTargetY = vertexTarget.Y;
374+
if (!vertexTarget.HasValue)
375+
continue;
376+
377+
verticesList[i].VerticeTargetX = vertexTarget.Value.X;
378+
verticesList[i].VerticeTargetY = vertexTarget.Value.Y;
372379
}
373380

374381
foreach (var vertice in verticesList)

WowPacketParserModule.V5_5_0_61735/Parsers/UpdateHandler1158.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,20 +355,27 @@ private static void ReadCreateObjectBlock(Packet packet, CreateObject createObje
355355

356356
for (var i = 0; i < createProperties.AreaTriggerData.Polygon.Vertices.Count; ++i)
357357
{
358+
var vertex = createProperties.AreaTriggerData.Polygon.Vertices[i];
359+
if (!vertex.HasValue)
360+
continue;
361+
358362
verticesList.Add(new AreaTriggerCreatePropertiesPolygonVertex
359363
{
360364
areatriggerGuid = guid,
361365
Idx = (uint)i,
362-
VerticeX = createProperties.AreaTriggerData.Polygon.Vertices[i].X,
363-
VerticeY = createProperties.AreaTriggerData.Polygon.Vertices[i].Y
366+
VerticeX = vertex.Value.X,
367+
VerticeY = vertex.Value.Y
364368
});
365369
}
366370

367371
for (var i = 0; i < createProperties.AreaTriggerData.Polygon.VerticesTarget.Count; ++i)
368372
{
369373
var vertexTarget = createProperties.AreaTriggerData.Polygon.VerticesTarget[i];
370-
verticesList[i].VerticeTargetX = vertexTarget.X;
371-
verticesList[i].VerticeTargetY = vertexTarget.Y;
374+
if (!vertexTarget.HasValue)
375+
continue;
376+
377+
verticesList[i].VerticeTargetX = vertexTarget.Value.X;
378+
verticesList[i].VerticeTargetY = vertexTarget.Value.Y;
372379
}
373380

374381
foreach (var vertice in verticesList)

WowPacketParserModule.V5_5_0_61735/UpdateFields/V5_5_1_63311/AreaTriggerPolygon.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public class AreaTriggerPolygon : IAreaTriggerPolygon
1313
{
1414
public System.Nullable<float> Height { get; set; }
1515
public System.Nullable<float> HeightTarget { get; set; }
16-
public DynamicUpdateField<Vector2> Vertices { get; } = new DynamicUpdateField<Vector2>();
17-
public DynamicUpdateField<Vector2> VerticesTarget { get; } = new DynamicUpdateField<Vector2>();
16+
public DynamicUpdateField<System.Nullable<Vector2>> Vertices { get; } = new DynamicUpdateField<System.Nullable<Vector2>>();
17+
public DynamicUpdateField<System.Nullable<Vector2>> VerticesTarget { get; } = new DynamicUpdateField<System.Nullable<Vector2>>();
1818
}
1919
}
2020

WowPacketParserModule.V5_5_0_61735/UpdateFields/V5_5_2_64068/AreaTriggerPolygon.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public class AreaTriggerPolygon : IAreaTriggerPolygon
1313
{
1414
public System.Nullable<float> Height { get; set; }
1515
public System.Nullable<float> HeightTarget { get; set; }
16-
public DynamicUpdateField<Vector2> Vertices { get; } = new DynamicUpdateField<Vector2>();
17-
public DynamicUpdateField<Vector2> VerticesTarget { get; } = new DynamicUpdateField<Vector2>();
16+
public DynamicUpdateField<System.Nullable<Vector2>> Vertices { get; } = new DynamicUpdateField<System.Nullable<Vector2>>();
17+
public DynamicUpdateField<System.Nullable<Vector2>> VerticesTarget { get; } = new DynamicUpdateField<System.Nullable<Vector2>>();
1818
}
1919
}
2020

0 commit comments

Comments
 (0)