mirror of
https://github.com/goatcorp/Dalamud.git
synced 2026-02-26 06:31:48 +01:00
Try-catch packet read
This commit is contained in:
parent
9205529820
commit
25bd09b9bb
1 changed files with 25 additions and 16 deletions
|
|
@ -5,6 +5,8 @@ using Dalamud.Data;
|
||||||
|
|
||||||
using Lumina.Excel.Sheets;
|
using Lumina.Excel.Sheets;
|
||||||
|
|
||||||
|
using Serilog;
|
||||||
|
|
||||||
namespace Dalamud.Game.ClientState;
|
namespace Dalamud.Game.ClientState;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -52,6 +54,8 @@ public class ZoneInitEventArgs : EventArgs
|
||||||
var dataManager = Service<DataManager>.Get();
|
var dataManager = Service<DataManager>.Get();
|
||||||
var eventArgs = new ZoneInitEventArgs();
|
var eventArgs = new ZoneInitEventArgs();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
var flags = *(byte*)(packet + 0x12);
|
var flags = *(byte*)(packet + 0x12);
|
||||||
|
|
||||||
eventArgs.TerritoryType = dataManager.GetExcelSheet<TerritoryType>().GetRow(*(ushort*)(packet + 0x02));
|
eventArgs.TerritoryType = dataManager.GetExcelSheet<TerritoryType>().GetRow(*(ushort*)(packet + 0x02));
|
||||||
|
|
@ -70,6 +74,11 @@ public class ZoneInitEventArgs : EventArgs
|
||||||
eventArgs.ActiveFestivals[i] = dataManager.GetExcelSheet<Festival>().GetRow(*(ushort*)(packet + 0x26 + (i * 2)));
|
eventArgs.ActiveFestivals[i] = dataManager.GetExcelSheet<Festival>().GetRow(*(ushort*)(packet + 0x26 + (i * 2)));
|
||||||
eventArgs.ActiveFestivalPhases[i] = *(ushort*)(packet + 0x36 + (i * 2));
|
eventArgs.ActiveFestivalPhases[i] = *(ushort*)(packet + 0x36 + (i * 2));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Log.Error(ex, "Failed to read ZoneInit packet");
|
||||||
|
}
|
||||||
|
|
||||||
return eventArgs;
|
return eventArgs;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue