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

fix: Removes timer error for world in initial state, and removes OPL requirement for spellbooks (#1197)

Browse source
This commit is contained in:
Kamron Batman 2022-10-19 02:32:04 -07:00 • committed by GitHub
parent 791128f238
commit ca3b173c4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server/Network/Packets/OutgoingContainerPackets.cs
View file

@ -33,7 +33,7 @@ public static class OutgoingContainerPackets
return;
}
if (ObjectPropertyList.Enabled && ns.NewSpellbook)
if (ns.NewSpellbook)
{
ns.SendNewSpellbookContent(book, graphic, offset, content);
}

4
Projects/Server/Timer/Timer.cs
View file

@ -79,7 +79,7 @@ public partial class Timer
public Timer Start()
{
if (World.WorldState is WorldState.Initial or WorldState.Saving)
if (World.WorldState is WorldState.Saving)
{
logger.Error(
"Attempted to start timer {Timer} ({HashCode}) while world is {State}\n{StackTrace}",
@ -123,7 +123,7 @@ public partial class Timer
public void Stop()
{
if (World.WorldState is WorldState.Initial or WorldState.Saving)
if (World.WorldState is WorldState.Saving)
{
logger.Error(
"Attempted to stop timer {Timer} ({HashCode}) while world is {State}\n{StackTrace}",

3
Projects/UOContent/Multis/Houses/BaseHouse.cs
View file

@ -1197,7 +1197,10 @@ namespace Server.Multis
{
LockedDownFlag = 1;
SecureFlag = 2;
}
public static void Initialize()
{
Timer.DelayCall(TimeSpan.FromMinutes(1.0), TimeSpan.FromMinutes(1.0), Decay_OnTick);
}