Fix IsPvPExcludingDen

Aireil · web-flow · commit 0469a017c7e7 · 2024-11-24T12:01:48.000+01:00
diff --git a/Dalamud/Game/ClientState/ClientState.cs b/Dalamud/Game/ClientState/ClientState.cs
@@ -137,7 +137,7 @@ public unsafe bool IsLoggedIn
     public bool IsPvP { get; private set; }
 
     /// <inheritdoc/>
-    public bool IsPvPExcludingDen { get; private set; }
+    public bool IsPvPExcludingDen => this.IsPvP && this.TerritoryType != 250;
 
     /// <inheritdoc />
     public bool IsGPosing => GameMain.IsInGPose();
@@ -195,7 +195,6 @@ private unsafe void SetupTerritoryTypeDetour(EventFramework* eventFramework, ush
             if (isPvP != this.IsPvP)
             {
                 this.IsPvP = isPvP;
-                this.IsPvPExcludingDen = this.IsPvP && this.TerritoryType != 250;
 
                 if (this.IsPvP)
                 {

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public unsafe bool IsLoggedIn`
`137`	`137`	`public bool IsPvP { get; private set; }`
`138`	`138`
`139`	`139`	`/// <inheritdoc/>`
`140`		`- public bool IsPvPExcludingDen { get; private set; }`
	`140`	`+ public bool IsPvPExcludingDen => this.IsPvP && this.TerritoryType != 250;`
`141`	`141`
`142`	`142`	`/// <inheritdoc />`
`143`	`143`	`public bool IsGPosing => GameMain.IsInGPose();`
`@@ -195,7 +195,6 @@ private unsafe void SetupTerritoryTypeDetour(EventFramework* eventFramework, ush`
`195`	`195`	`if (isPvP != this.IsPvP)`
`196`	`196`	`{`
`197`	`197`	`this.IsPvP = isPvP;`
`198`		`- this.IsPvPExcludingDen = this.IsPvP && this.TerritoryType != 250;`
`199`	`198`
`200`	`199`	`if (this.IsPvP)`
`201`	`200`	`{`