fix: input will be disable when in pvp zone.

ArchiDog1998 · Mar 31, 2023 · b381539 · b381539
1 parent 9ca5f38
commit b381539
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/RotationSolver/Updaters/InputUpdater.cs b/RotationSolver/Updaters/InputUpdater.cs
@@ -92,7 +92,7 @@ private static void KeyDown(KeyRecord key)
             return;
         }
 
-        if (!Service.Config.UseKeyboardCommand) return;
+        if (!Service.Config.UseKeyboardCommand || SocialUpdater.InPvp) return;
 
         if (Service.Config.KeyState.ContainsValue(key))
         {
@@ -130,7 +130,7 @@ private static void ButtonDown(ButtonRecord button)
             return;
         }
 
-        if (!Service.Config.UseGamepadCommand) return;
+        if (!Service.Config.UseGamepadCommand || SocialUpdater.InPvp) return;
 
         if (Service.Config.ButtonState.ContainsValue(button))
         {

diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
@@ -13,6 +13,7 @@ namespace RotationSolver.Updaters;
 
 internal class SocialUpdater
 {
+    public static bool InPvp { get; private set; }
     static List<string> _macroToAuthor = new List<string>()
     {
         "blush",
@@ -73,6 +74,7 @@ static void ClientState_TerritoryChanged(object sender, ushort e)
         {
             _canSaying = true;
         }
+        InPvp = territory.IsPvpZone;
         DataCenter.InHighEndDuty = HighEndDuties.Any(t => t.RowId == territory.RowId);
     }