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

Update ZoneInit.cs

Browse source
This commit is contained in:
Infi 2026-02-02 19:26:38 +01:00 • committed by GitHub
parent 3d79cbf655
commit 58ce620340
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,6 +62,7 @@ public class ZoneInitEventArgs : EventArgs
Log.Error($"Failed to get TerritoryType row with ID {territoryKey}. Corrupted packet?"); Log.Error($"Failed to get TerritoryType row with ID {territoryKey}. Corrupted packet?");
return new ZoneInitEventArgs(); return new ZoneInitEventArgs();
} }
eventArgs.TerritoryType = territoryRow; eventArgs.TerritoryType = territoryRow;
var contentFinderKey = *(ushort*)(packet + 0x06); var contentFinderKey = *(ushort*)(packet + 0x06);
@ -70,6 +71,7 @@ public class ZoneInitEventArgs : EventArgs
Log.Error($"Failed to get ContentFinderCondition row with ID {contentFinderKey}. Corrupted packet?"); Log.Error($"Failed to get ContentFinderCondition row with ID {contentFinderKey}. Corrupted packet?");
return new ZoneInitEventArgs(); return new ZoneInitEventArgs();
} }
eventArgs.ContentFinderCondition = contentFinderRow; eventArgs.ContentFinderCondition = contentFinderRow;
var weatherKey = *(byte*)(packet + 0x10); var weatherKey = *(byte*)(packet + 0x10);
@ -78,6 +80,7 @@ public class ZoneInitEventArgs : EventArgs
Log.Error($"Failed to get Weather row with ID {weatherKey}. Corrupted packet?"); Log.Error($"Failed to get Weather row with ID {weatherKey}. Corrupted packet?");
return new ZoneInitEventArgs(); return new ZoneInitEventArgs();
} }
eventArgs.Weather = weatherRow; eventArgs.Weather = weatherRow;
eventArgs.Instance = flags >= 0 ? (ushort)0 : *(ushort*)(packet + 0x04); eventArgs.Instance = flags >= 0 ? (ushort)0 : *(ushort*)(packet + 0x04);
@ -96,6 +99,7 @@ public class ZoneInitEventArgs : EventArgs
Log.Error($"Failed to get Festival row with ID {festivalKey}. Corrupted packet?"); Log.Error($"Failed to get Festival row with ID {festivalKey}. Corrupted packet?");
return new ZoneInitEventArgs(); return new ZoneInitEventArgs();
} }
eventArgs.ActiveFestivals[i] = festivalRow; eventArgs.ActiveFestivals[i] = festivalRow;
eventArgs.ActiveFestivalPhases[i] = *(ushort*)(packet + 0x36 + (i * 2)); eventArgs.ActiveFestivalPhases[i] = *(ushort*)(packet + 0x36 + (i * 2));
} }