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

Fixes packet length & PropertyList (#82)

Browse source
This commit is contained in:
Kamron Batman 2020-01-21 21:00:56 -08:00 • committed by GitHub
parent 1f1ceade8c
commit 27e8d823bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 251 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/Scripts/Items/Armor/BaseArmor.cs
View file

@ -1370,9 +1370,9 @@ namespace Server.Items
return base.CanEquip(from);
}
public override bool CheckPropertyConfliction(Mobile m)
public override bool CheckPropertyConflict(Mobile m)
{
if (base.CheckPropertyConfliction(m))
if (base.CheckPropertyConflict(m))
return true;
if (Layer == Layer.Pants)

4
Projects/Scripts/Items/Clothing/BaseClothing.cs
View file

@ -544,9 +544,9 @@ namespace Server.Items
return Attributes.SpellChanneling != 0;
}
public override bool CheckPropertyConfliction(Mobile m)
public override bool CheckPropertyConflict(Mobile m)
{
if (base.CheckPropertyConfliction(m))
if (base.CheckPropertyConflict(m))
return true;
if (Layer == Layer.Pants)

33
Projects/Scripts/Items/Misc/Corpses/Corpse.cs
View file

@ -541,31 +541,22 @@ namespace Server.Items
writer.WriteDeltaTime(TimeOfDeath);
List<KeyValuePair<Item, Point3D>> list = m_RestoreTable == null
? null
: new List<KeyValuePair<Item, Point3D>>(m_RestoreTable);
int count = list?.Count ?? 0;
int count = m_RestoreTable?.Count ?? 0;
writer.Write(count);
for (int i = 0; i < count; ++i)
{
KeyValuePair<Item, Point3D> kvp = list[i];
Item item = kvp.Key;
Point3D loc = kvp.Value;
writer.Write(item);
if (item.Location == loc)
if (m_RestoreTable != null)
foreach (var (item, loc) in m_RestoreTable)
{
writer.Write(false);
writer.Write(item);
if (item.Location == loc)
writer.Write(false);
else
{
writer.Write(true);
writer.Write(loc);
}
}
else
{
writer.Write(true);
writer.Write(loc);
}
}
writer.Write(m_DecayTimer != null);

1
Projects/Scripts/Scripts.csproj
View file

@ -13,6 +13,7 @@
<WarningsAsErrors />
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>8.0</LangVersion>
<OutDir>..\..\Distribution\Assemblies</OutDir>
<OutputPath>..\..\Distribution\Assemblies</OutputPath>
<PublishDir>..\..\Distribution\Assemblies</PublishDir>