Request evidence is more leniant

Enovale · Oct 17, 2020 · 6980755 · 6980755
1 parent 25b7a19
commit 6980755
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 19 deletions.
diff --git a/.idea/.idea.Alibi/.idea/contentModel.xml b/.idea/.idea.Alibi/.idea/contentModel.xml
diff --git a/.idea/.idea.Alibi/.idea/workspace.xml b/.idea/.idea.Alibi/.idea/workspace.xml
diff --git a/Alibi.Plugins.API/Attributes/RequireStateAttribute.cs b/Alibi.Plugins.API/Attributes/RequireStateAttribute.cs
@@ -6,7 +6,12 @@ namespace Alibi.Plugins.API.Attributes
     public class RequireStateAttribute : Attribute
     {
         public ClientState State { get; }
+        public bool Kick { get; }
 
-        public RequireStateAttribute(ClientState requiredState) => State = requiredState;
+        public RequireStateAttribute(ClientState requiredState, bool kickIfFalse = true)
+        {
+            State = requiredState;
+            Kick = kickIfFalse;
+        }
     }
 }
diff --git a/Alibi/Protocol/MessageHandler.cs b/Alibi/Protocol/MessageHandler.cs
@@ -24,11 +24,13 @@ public static void HandleMessage(IClient client, IAOPacket packet)
                     var stateAttr = Handlers[packet.Type].Method.GetCustomAttribute<RequireStateAttribute>();
 
                     if (stateAttr != null)
-                        if (client.CurrentState != stateAttr.State)
+                        if (client.CurrentState != stateAttr.State && stateAttr.Kick)
                         {
                             client.Kick("Protocol violation.");
                             return;
                         }
+                        else if(client.CurrentState != stateAttr.State)
+                            return;
 
                     Handlers[packet.Type].Method.Invoke(Handlers[packet.Type].Target, new object[] {client, packet});
                 }

diff --git a/Alibi/Protocol/Messages.cs b/Alibi/Protocol/Messages.cs
@@ -125,7 +125,7 @@ internal static void RequestCharacters(IClient client, IAOPacket packet)
         }
 
         [MessageHandler("RE")]
-        [RequireState(ClientState.Identified)]
+        [RequireState(ClientState.InArea, false)]
         internal static void RequestEvidence(IClient client, IAOPacket packet)
         {
             string[] evidenceList = new string[client.Area!.EvidenceList.Count];