forked from collabvm/collab-vm-server-1.3
- fix inconsistent nop timer
- switch back to List as im pretty sure it caused more problems than it solved
This commit is contained in:
parent
dd05a60cf9
commit
fe71945b6d
|
@ -97,7 +97,7 @@ public class User
|
||||||
}
|
}
|
||||||
this.timeOut = false;
|
this.timeOut = false;
|
||||||
this.timeoutTimer.Stop();
|
this.timeoutTimer.Stop();
|
||||||
this.timeoutTimer.Interval = 3000;
|
this.timeoutTimer.Interval = 10000;
|
||||||
this.timeoutTimer.Start();
|
this.timeoutTimer.Start();
|
||||||
switch (msgArr[0])
|
switch (msgArr[0])
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Concurrent;
|
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using CollabVM.Server.Config;
|
using CollabVM.Server.Config;
|
||||||
using SixLabors.ImageSharp;
|
using SixLabors.ImageSharp;
|
||||||
|
@ -16,7 +14,7 @@ public class VM
|
||||||
// Public properties and events
|
// Public properties and events
|
||||||
public VMController Controller { get; }
|
public VMController Controller { get; }
|
||||||
public VMConfig Config { get; }
|
public VMConfig Config { get; }
|
||||||
public SynchronizedCollection<User> Users { get; } = new();
|
public List<User> Users { get; } = new();
|
||||||
public CircularBuffer.CircularBuffer<ChatMessage> ChatHistory { get; } = new((int)Program.Config.Chat.ChatHistoryLength);
|
public CircularBuffer.CircularBuffer<ChatMessage> ChatHistory { get; } = new((int)Program.Config.Chat.ChatHistoryLength);
|
||||||
public TurnQueue TurnQueue { get; } = new(Program.Config.Turns.TurnTime);
|
public TurnQueue TurnQueue { get; } = new(Program.Config.Turns.TurnTime);
|
||||||
public ResetVote? Vote { get; private set; }
|
public ResetVote? Vote { get; private set; }
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
<PackageReference Include="Samboy063.Tomlet" Version="5.2.0" />
|
<PackageReference Include="Samboy063.Tomlet" Version="5.2.0" />
|
||||||
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
|
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||||
<PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
Loading…
Reference in a new issue