INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-10 15:20:48 -05:00
Code Issues Releases Wiki Activity

hopefully finished with RCon changes.

Browse Source 
added more tests.
fixed issues from event changes (there's most definitely still issues related to that)
This commit is contained in:
RaidMax
2018-10-02 12:39:08 -05:00
parent 4eea217e82
commit ca9e20ebd3
15 changed files with 428 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
WebfrontCore/Controllers/ActionController.cs
View File

@ -50,22 +50,24 @@ namespace WebfrontCore.Controllers
{
string duration = string.Empty;
var loc = Utilities.CurrentLocalization.LocalizationIndex;
switch (Duration)
{
case 1:
duration = "1h";
duration = $"1{loc["GLOBAL_TIME_HOURS"][0]}";
break;
case 2:
duration = "6h";
duration = $"6{loc["GLOBAL_TIME_HOURS"][0]}";
break;
case 3:
duration = "1d";
duration = $"1{loc["GLOBAL_TIME_DAYS"][0]}";
break;
case 4:
duration = "2d";
duration = $"2{loc["GLOBAL_TIME_DAYS"][0]}";
break;
case 5:
duration = "1w";
duration = $"1{loc["GLOBAL_TIME_WEEKS"][0]}";
break;
}

2
WebfrontCore/Controllers/ConsoleController.cs
View File

@ -49,7 +49,7 @@ namespace WebfrontCore.Controllers
Manager.GetEventHandler().AddEvent(remoteEvent);
List<CommandResponseInfo> response;
// wait for the event to process
if (await remoteEvent.WaitAsync(60 * 1000))
if (!(await remoteEvent.WaitAsync(60 * 1000)).Failed)
{
response = server.CommandResult.Where(c => c.ClientId == client.ClientId).ToList();