ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: use GameMain.IsInPvPInstance() to check for PvP instance event

Browse source
This commit is contained in:
goaaats 2022-05-16 13:28:17 +02:00
parent 25e46f8d1c
commit c74af9a6f2
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dalamud/Game/ClientState/ClientState.cs
View file

@ -17,7 +17,7 @@ using Dalamud.Hooking;
using Dalamud.IoC; using Dalamud.IoC;
using Dalamud.IoC.Internal; using Dalamud.IoC.Internal;
using Dalamud.Utility; using Dalamud.Utility;
using Lumina.Excel.GeneratedSheets; using FFXIVClientStructs.FFXIV.Client.Game;
using Serilog; using Serilog;
namespace Dalamud.Game.ClientState namespace Dalamud.Game.ClientState
@ -203,11 +203,7 @@ namespace Dalamud.Game.ClientState
gameGui.ResetUiHideState(); gameGui.ResetUiHideState();
} }
if (this.TerritoryType != 0) this.IsPvP = GameMain.IsInPvPInstance();
{
var terriRow = data.GetExcelSheet<TerritoryType>()!.GetRow(this.TerritoryType);
this.IsPvP = terriRow?.Bg.RawString.StartsWith("ffxiv/pvp") ?? false;
}
if (this.IsPvP != this.lastFramePvP) if (this.IsPvP != this.lastFramePvP)
{ {