Disable AutoOpen if not allowed in PvP

MidoriKami · Jun 28, 2024 · 01c1f4d · 01c1f4d
1 parent 60645ea
commit 01c1f4d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Window/WindowManager.cs b/Window/WindowManager.cs
@@ -61,8 +61,13 @@ public void AddWindow(Window window, WindowFlags? windowFlags = null) {
         if (window.WindowFlags.HasFlag(WindowFlags.OpenImmediately)) {
             var isLoggedIn = ClientState.IsLoggedIn;
             var requiresLoggedIn = window.WindowFlags.HasFlag(WindowFlags.RequireLoggedIn);
+            var disallowInPvP = !window.WindowFlags.HasFlag(WindowFlags.AllowInPvP);
+            var isInPvP = ClientState.IsPvP;
 
-            if (!requiresLoggedIn || (requiresLoggedIn && isLoggedIn)) {
+            var loginCheckPass = !requiresLoggedIn || (requiresLoggedIn && isLoggedIn);
+            var pvpCheckPass = !disallowInPvP || (disallowInPvP && isInPvP);
+
+            if (loginCheckPass && pvpCheckPass) {
                 window.UnCollapseOrShow();
             }
         }