warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(core): Core cleanup, adds event loop synchronization, and fixes gumps (#429)

Browse source 
- [X] Cleans up gump packets
- [X] Adds event loop task synchronization
- [X] Moves timer pause and cleans up the delay task timer class
- [X] Cleans up the conserve cpu
- [X] Renames variables to make them consistent with the new style
- [X] Removes process delta recursion checking.
- [X] Properly diposes net states. This fixes edge cases that may cause hanging connections to stay open longer than they should.
- [X] Fixes an issue with gump items not compiling properly

Users can now utilize `Timer.Pause()` since the code will be executed on the proper thread.

```cs
public void async void Talk()
{
    _canTalk = false;
    await Timer.Pause(Utility.RandomMinMax(5000, 8000)); // Talk after 5-8 seconds
    DoTalk();
    await Timer.Pause(Utility.RandomMinMax(12000, 25000)); // Reset ability to talk after 12-25 seconds
    _canTalk = true;
}
```
This commit is contained in:
Kamron Batman 2021-01-25 21:06:46 -08:00 • committed by GitHub
parent 07751654b7
commit 6f0e1a22f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 763 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Projects/UOContent/Gumps/AdminGump.cs
View file

@ -2,9 +2,9 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading;
using Server.Accounting;
using Server.Buffers;
using Server.Commands;
using Server.Items;
using Server.Misc;
@ -222,11 +222,7 @@ namespace Server.Gumps
}
case AdminGumpPage.Information_Perf:
{
AddLabel(20, 130, LabelHue, "Cycles Per Second:");
AddLabel(40, 150, LabelHue, $"Current: {Core.CyclesPerSecond:N2}");
AddLabel(40, 170, LabelHue, $"Average: {Core.AverageCPS:N2}");
var sb = new StringBuilder();
using var sb = new ValueStringBuilder();
ThreadPool.GetAvailableThreads(out var curUser, out var curIOCP);
ThreadPool.GetMaxThreads(out var maxUser, out var maxIOCP);
@ -646,7 +642,7 @@ namespace Server.Gumps
AddLabel(12, 140, LabelHue, "There are no accounts to display.");
}
var sb = new StringBuilder();
using var sb = new ValueStringBuilder();
for (int i = 0, index = listPage * 12;
i < 12 && index >= 0 && index < sharedAccounts.Count;
@ -662,10 +658,7 @@ namespace Server.Gumps
AddLabelCropped(12, offset, 60, 20, LabelHue, accts.Count.ToString());
AddLabelCropped(72, offset, 120, 20, LabelHue, ipAddr.ToString());
if (sb.Length > 0)
{
sb.Length = 0;
}
sb.Reset();
for (var j = 0; j < accts.Count; ++j)
{
@ -1199,7 +1192,7 @@ namespace Server.Gumps
AddButtonLabeled(20, 150, GetButtonID(5, 4), "Add Comment");
var sb = new StringBuilder();
var sb = new ValueStringBuilder();
if (a.Comments.Count == 0)
{
@ -1214,12 +1207,17 @@ namespace Server.Gumps
}
var c = a.Comments[i];
sb.AppendFormat("[{0} on {1}]<BR>{2}", c.AddedBy, c.LastModified, c.Content);
sb.Append('[');
sb.Append(c.AddedBy);
sb.Append(" on ");
sb.Append(c.LastModified.ToString());
sb.Append("]<BR>");
sb.Append(c.Content);
}
AddHtml(20, 180, 380, 190, sb.ToString(), true, true);
sb.Dispose(); // Due to an analyzer bug, we can't use a using
goto case AdminGumpPage.AccountDetails;
}
case AdminGumpPage.AccountDetails_Tags:
@ -1233,7 +1231,7 @@ namespace Server.Gumps
AddButtonLabeled(20, 150, GetButtonID(5, 5), "Add Tag");
var sb = new StringBuilder();
var sb = new ValueStringBuilder();
if (a.Tags.Count == 0)
{
@ -1249,11 +1247,14 @@ namespace Server.Gumps
var tag = a.Tags[i];
sb.AppendFormat("{0} = {1}", tag.Name, tag.Value);
sb.Append(tag.Name);
sb.Append(" = ");
sb.Append(tag.Value);
}
AddHtml(20, 180, 380, 190, sb.ToString(), true, true);
sb.Dispose();
goto case AdminGumpPage.AccountDetails;
}
case AdminGumpPage.Firewall:
@ -2917,17 +2918,16 @@ namespace Server.Gumps
if (list.Count > 0)
{
var sb = new StringBuilder();
sb.AppendFormat(
"You are about to ban {0} account{1}. Do you wish to continue?",
list.Count,
list.Count != 1 ? "s" : ""
);
using var sb = new ValueStringBuilder();
sb.Append("You are about to ban ");
sb.Append(list.Count);
sb.Append(list.Count != 1 ? "accounts." : "account.");
sb.Append(" Do you wish to continue?");
for (var i = 0; i < list.Count; ++i)
{
sb.AppendFormat("<br>- {0}", list[i].Username);
sb.Append("<br>- ");
sb.Append(list[i].Username);
}
from.SendGump(