ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-07 00:14:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Use RowRef in ZoneInitEventArgs (#2540)" (#2597)

Browse source 
This reverts commit 5da79a7dba.
This commit is contained in:
KazWolfe 2026-01-27 09:30:34 -08:00 • committed by GitHub
parent 10ef40ddf5
commit c0077b1e26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Dalamud/Game/ClientState/ZoneInit.cs
View file

@ -3,11 +3,8 @@ using System.Text;
using Dalamud.Data;
using Lumina.Excel;
using Lumina.Excel.Sheets;
using Serilog;
namespace Dalamud.Game.ClientState;
/// <summary>
@ -18,7 +15,7 @@ public class ZoneInitEventArgs : EventArgs
/// <summary>
/// Gets the territory type of the zone being entered.
/// </summary>
public RowRef<TerritoryType> TerritoryType { get; private set; }
public TerritoryType TerritoryType { get; private set; }
/// <summary>
/// Gets the instance number of the zone, used when multiple copies of an area are active.
@ -28,17 +25,17 @@ public class ZoneInitEventArgs : EventArgs
/// <summary>
/// Gets the associated content finder condition for the zone, if any.
/// </summary>
public RowRef<ContentFinderCondition> ContentFinderCondition { get; private set; }
public ContentFinderCondition ContentFinderCondition { get; private set; }
/// <summary>
/// Gets the current weather in the zone upon entry.
/// </summary>
public RowRef<Weather> Weather { get; private set; }
public Weather Weather { get; private set; }
/// <summary>
/// Gets the set of active festivals in the zone.
/// </summary>
public RowRef<Festival>[] ActiveFestivals { get; private set; } = [];
public Festival[] ActiveFestivals { get; private set; } = [];
/// <summary>
/// Gets the phases corresponding to the active festivals.
@ -57,20 +54,20 @@ public class ZoneInitEventArgs : EventArgs
var flags = *(byte*)(packet + 0x12);
eventArgs.TerritoryType = LuminaUtils.CreateRef<TerritoryType>(*(ushort*)(packet + 0x02));
eventArgs.TerritoryType = dataManager.GetExcelSheet<TerritoryType>().GetRow(*(ushort*)(packet + 0x02));
eventArgs.Instance = flags >= 0 ? (ushort)0 : *(ushort*)(packet + 0x04);
eventArgs.ContentFinderCondition = LuminaUtils.CreateRef<ContentFinderCondition>(*(ushort*)(packet + 0x06));
eventArgs.Weather = LuminaUtils.CreateRef<Weather>(*(byte*)(packet + 0x10));
eventArgs.ContentFinderCondition = dataManager.GetExcelSheet<ContentFinderCondition>().GetRow(*(ushort*)(packet + 0x06));
eventArgs.Weather = dataManager.GetExcelSheet<Weather>().GetRow(*(byte*)(packet + 0x10));
const int NumFestivals = 8;
eventArgs.ActiveFestivals = new RowRef<Festival>[NumFestivals];
eventArgs.ActiveFestivals = new Festival[NumFestivals];
eventArgs.ActiveFestivalPhases = new ushort[NumFestivals];
// There are also 4 festival ids and phases for PlayerState at +0x3E and +0x46 respectively,
// but it's unclear why they exist as separate entries and why they would be different.
for (var i = 0; i < NumFestivals; i++)
{
eventArgs.ActiveFestivals[i] = LuminaUtils.CreateRef<Festival>(*(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));
}