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

Fix bad serials (#304)

Browse source 
- [X] Fixes bad serial calculations
- [X] Tightens HexStrings

Bumps release version
Updates documentation
This commit is contained in:
Kamron Batman 2020-11-08 12:09:26 -08:00 • committed by GitHub
parent b0c1076cb5
commit ae436cb55f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 76 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Projects/Server/World/World.cs
View file

@ -39,15 +39,14 @@ namespace Server
public static class World
{
private static readonly ManualResetEvent m_DiskWriteHandle = new ManualResetEvent(true);
private static Dictionary<Serial, IEntity> _pendingAdd;
private static Dictionary<Serial, IEntity> _pendingDelete;
private static ConcurrentQueue<Item> _decayQueue = new ConcurrentQueue<Item>();
private static readonly Dictionary<Serial, IEntity> _pendingAdd = new Dictionary<Serial, IEntity>();
private static readonly Dictionary<Serial, IEntity> _pendingDelete = new Dictionary<Serial, IEntity>();
private static readonly ConcurrentQueue<Item> _decayQueue = new ConcurrentQueue<Item>();
public const uint ItemOffset = 0x40000000;
public const uint MaxItemSerial = 0x7FFFFFFF;
private const uint _maxItems = int.MaxValue - ItemOffset;
private const uint _maxMobiles = ItemOffset;
public const uint MaxMobileSerial = ItemOffset - 1;
private const uint _maxItems = MaxItemSerial - ItemOffset + 1;
private static Serial _lastMobile = Serial.Zero;
private static Serial _lastItem = ItemOffset;
@ -59,19 +58,18 @@ namespace Server
{
uint last = _lastMobile;
for (int i = 0; i < _maxMobiles; i++)
for (int i = 0; i < MaxMobileSerial; i++)
{
last++;
if (last >= _lastMobile)
if (last > MaxMobileSerial)
{
last = 0;
last = 1;
}
if (FindMobile(last) == null)
{
_lastMobile = last;
return last;
return _lastMobile = last;
}
}
@ -89,15 +87,14 @@ namespace Server
{
last++;
if (last - ItemOffset >= _maxItems)
if (last > MaxItemSerial)
{
last = ItemOffset;
}
if (FindItem(last) == null)
{
_lastItem = last;
return last;
return _lastItem = last;
}
}
@ -117,7 +114,6 @@ namespace Server
}
}
internal static int _Saves;
internal static List<Type> ItemTypes { get; } = new List<Type>();
internal static List<Type> MobileTypes { get; } = new List<Type>();
@ -361,9 +357,6 @@ namespace Server
var watch = Stopwatch.StartNew();
_pendingAdd = new Dictionary<Serial, IEntity>();
_pendingDelete = new Dictionary<Serial, IEntity>();
List<EntityIndex<Item>> items;
List<EntityIndex<Mobile>> mobiles;
List<EntityIndex<BaseGuild>> guilds;