fix bug with unwrapping

Author: DeinFreund

ZkLobbyServer/ServerBattle.cs

@@ -546,7 +546,12 @@ public async Task<bool> StartVote(BattleCommand cmd, Say e, string args, int tim
             if (topic == null) return false;
 
             var unwrappedCmd = cmd;
-            if (cmd is CmdPoll) unwrappedCmd = (cmd as CmdPoll).InternalCommand;
+            if (cmd is CmdPoll)
+            {
+                var split = args.Split(new[] { ' ' }, 2);
+                args = split.Length > 1 ? split[1] : "";
+                unwrappedCmd = (cmd as CmdPoll).InternalCommand;
+            }
 
             if (unwrappedCmd is CmdMap && string.IsNullOrEmpty(args)) return await CreateMultiMapPoll();
 

ZkLobbyServer/autohost/Commands/CmdPoll.cs

@@ -10,11 +10,8 @@ public class CmdPoll : BattleCommand
         public override string Shortcut => "poll";
         public override AccessType Access => AccessType.NoCheck;
         public override BattleCommand Create() => new CmdPoll();
+        public BattleCommand InternalCommand { get; private set; }
 
-        private BattleCommand commandToRun;
-
-        public BattleCommand InternalCommand { get { return commandToRun; } }
-        
         public override string Arm(ServerBattle battle, Say e, string arguments = null)
         {
             if (string.IsNullOrEmpty(arguments))
@@ -25,11 +22,11 @@ public override string Arm(ServerBattle battle, Say e, string arguments = null)
             var parts = arguments.Split(new[] { ' ' }, 2);
             var commandName = parts[0] ?? "";
             var commandArgs = parts.Length > 1 ? parts[1] : null;
-            commandToRun = battle.GetCommandByName(commandName);
+            InternalCommand = battle.GetCommandByName(commandName);
             string reason;
-            if (commandToRun.GetRunPermissions(battle, e.User, out reason) >= RunPermission.Vote && commandToRun.Access != AccessType.NoCheck && commandToRun.Access != AccessType.Admin && !(commandToRun.Access == AccessType.NotIngameNotAutohost && battle.IsAutohost))
+            if (InternalCommand.GetRunPermissions(battle, e.User, out reason) >= RunPermission.Vote && InternalCommand.Access != AccessType.NoCheck && InternalCommand.Access != AccessType.Admin && !(InternalCommand.Access == AccessType.NotIngameNotAutohost && battle.IsAutohost))
             {
-                return commandToRun.Arm(battle, e, commandArgs);
+                return InternalCommand.Arm(battle, e, commandArgs);
             }
             battle.Respond(e, reason);
             return null;
@@ -38,13 +35,13 @@ public override string Arm(ServerBattle battle, Say e, string arguments = null)
 
         public override async Task ExecuteArmed(ServerBattle battle, Say e)
         {
-            await commandToRun.ExecuteArmed(battle, e);
+            await InternalCommand.ExecuteArmed(battle, e);
         }
 
         public override RunPermission GetRunPermissions(ServerBattle battle, string userName, out string reason)
         {
-            if (commandToRun == null) return base.GetRunPermissions(battle, userName, out reason) >= RunPermission.Vote ? RunPermission.Vote : RunPermission.None;
-            return commandToRun.GetRunPermissions(battle, userName, out reason);
+            if (InternalCommand == null) return base.GetRunPermissions(battle, userName, out reason) >= RunPermission.Vote ? RunPermission.Vote : RunPermission.None;
+            return InternalCommand.GetRunPermissions(battle, userName, out reason);
         }
     }
 }