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

fix: Fixes factions and makes it static (#993)

Browse source
This commit is contained in:
Kamron Batman 2022-05-10 11:57:37 -07:00 • committed by GitHub
parent 097c0143b0
commit f7cbeacf48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 129 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server/Serialization/Persistence.cs
View file

@ -46,6 +46,8 @@ namespace Server
);
}
public static void Unregister(string name) => _registry.RemoveWhere(entry => entry.Name == name);
public static void Load(string path)
{
// This should probably not be parallel since Mobiles must be loaded before Items

120
Projects/UOContent/Engines/Factions/Core/FactionSystem.cs Normal file
View file

@ -0,0 +1,120 @@
using System;
namespace Server.Factions;
public static class FactionSystem
{
public static bool Enabled { get; private set; }
public static void Configure()
{
Enabled = ServerConfiguration.GetSetting("factions.enabled", false);
if (Enabled)
{
GenericPersistence.Register("Factions", Serialize, Deserialize);
}
}
// This does not do the actual work of removing faction stuff, only turns off the persistence.
public static void Disable()
{
if (!Enabled)
{
return;
}
Persistence.Unregister("Factions");
Enabled = false;
ServerConfiguration.SetSetting("factions.enabled", false);
}
// This does not do the actual work of creating faction stuff, only turns on the persistence.
public static void Enable()
{
if (Enabled)
{
return;
}
GenericPersistence.Register("Factions", Serialize, Deserialize);
Enabled = true;
ServerConfiguration.SetSetting("factions.enabled", true);
}
private static void Serialize(IGenericWriter writer)
{
writer.WriteEncodedInt(0); // version
var factions = Faction.Factions;
for (var i = 0; i < factions.Count; i++)
{
factions[i].State.Serialize(writer);
}
var towns = Town.Towns;
for (var i = 0; i < towns.Count; i++)
{
towns[i].State.Serialize(writer);
}
}
private static void Deserialize(IGenericReader reader)
{
var version = reader.ReadEncodedInt();
var count = reader.ReadEncodedInt();
for (var i = 0; i < count; i++)
{
new FactionState(reader);
}
count = reader.ReadEncodedInt();
for (var i = 0; i < count; i++)
{
new TownState(reader);
}
}
}
[ManualDirtyChecking]
[TypeAlias("Server.Factions.FactionPersistance")]
[Obsolete("Deprecated in favor of the static system. Only used for legacy deserialization")]
public class FactionPersistence : Item
{
public FactionPersistence()
{
Delete();
}
public FactionPersistence(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
int type;
while ((type = reader.ReadEncodedInt()) != 0)
{
if (type == 1)
{
new FactionState(reader);
}
else if (type == 2)
{
new TownState(reader);
}
}
}
}

2
Projects/UOContent/Engines/Factions/Core/Generator.cs
View file

@ -11,7 +11,7 @@ namespace Server.Factions
public static void GenerateFactions_OnCommand(CommandEventArgs e)
{
new FactionPersistance();
FactionSystem.Enable();
var factions = Faction.Factions;

91
Projects/UOContent/Engines/Factions/Core/Persistance.cs
View file

@ -1,91 +0,0 @@
namespace Server.Factions
{
public class FactionPersistance : Item
{
public FactionPersistance() : base(1)
{
Movable = false;
if (Instance?.Deleted == true)
{
Instance = this;
}
else
{
base.Delete();
}
}
public FactionPersistance(Serial serial) : base(serial) => Instance = this;
public static FactionPersistance Instance { get; private set; }
public override string DefaultName => "Faction Persistance - Internal";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
var factions = Faction.Factions;
for (var i = 0; i < factions.Count; ++i)
{
writer.WriteEncodedInt((int)PersistedType.Faction);
factions[i].State.Serialize(writer);
}
var towns = Town.Towns;
for (var i = 0; i < towns.Count; ++i)
{
writer.WriteEncodedInt((int)PersistedType.Town);
towns[i].State.Serialize(writer);
}
writer.WriteEncodedInt((int)PersistedType.Terminator);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 0:
{
PersistedType type;
while ((type = (PersistedType)reader.ReadEncodedInt()) != PersistedType.Terminator)
{
switch (type)
{
case PersistedType.Faction:
new FactionState(reader);
break;
case PersistedType.Town:
new TownState(reader);
break;
}
}
break;
}
}
}
public override void Delete()
{
}
private enum PersistedType
{
Terminator,
Faction,
Town
}
}
}

7
Projects/UOContent/Engines/Stealables/StealableArtifacts.cs
View file

@ -19,7 +19,7 @@ public static class StealableArtifacts
public static void Configure()
{
GenericPersistence.Register("stealable-artifacts", Serialize, Deserialize);
GenericPersistence.Register("StealableArtifacts", Serialize, Deserialize);
}
private static void RemoveStealableArtifacts()
@ -426,12 +426,17 @@ public static class StealableArtifacts
{
private StealableArtifactsSpawner()
{
Delete();
}
public StealableArtifactsSpawner(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);