Pilz.NET/Pilz.Dalamud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix ActivityContentManager

Browse Source
This commit is contained in:
Pascal
2024-11-23 08:50:38 +01:00
parent 83d705c4c6
commit ca28a9d6f7
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs
View File

@@ -40,31 +40,40 @@ public class ActivityContextManager : IDisposable
ActivityType newActivityContext; ActivityType newActivityContext;
ZoneType newZoneType; ZoneType newZoneType;
if (content.PvP) if (content.RowId == 0)
{ {
newActivityContext = ActivityType.PvpDuty; // No content found, so we must be on the overworld
newZoneType = ZoneType.Pvp; newActivityContext = ActivityType.None;
newZoneType = ZoneType.Overworld;
} }
else else
{ {
newActivityContext = ActivityType.PveDuty; if (content.PvP)
// Find correct member type
var memberType = content.ContentMemberType.RowId;
if (content.RowId == 16 || content.RowId == 15)
memberType = 2; // Praetorium and Castrum Meridianum
else if (content.RowId == 735 || content.RowId == 778)
memberType = 127; // Bozja
// Check for ZoneType
newZoneType = memberType switch
{ {
2 => ZoneType.Doungen, newActivityContext = ActivityType.PvpDuty;
3 => ZoneType.Raid, newZoneType = ZoneType.Pvp;
4 => ZoneType.AllianceRaid, }
127 => ZoneType.Foray, else
_ => ZoneType.Doungen, {
}; newActivityContext = ActivityType.PveDuty;
// Find correct member type
var memberType = content.ContentMemberType.RowId;
if (content.RowId == 16 || content.RowId == 15)
memberType = 2; // Praetorium and Castrum Meridianum
else if (content.RowId == 735 || content.RowId == 778)
memberType = 127; // Bozja
// Check for ZoneType
newZoneType = memberType switch
{
2 => ZoneType.Doungen,
3 => ZoneType.Raid,
4 => ZoneType.AllianceRaid,
127 => ZoneType.Foray,
_ => ZoneType.Doungen,
};
}
} }
CurrentActivityContext = new(newActivityContext, newZoneType); CurrentActivityContext = new(newActivityContext, newZoneType);