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

fix: Fixes negative weight issue (#1621)

Browse source 
Closes #73
This commit is contained in:
Kamron Batman 2023-11-26 10:04:29 -08:00 • committed by GitHub
parent 4f6afad10b
commit 130a5674bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Projects/Server/Items/Item.cs
View file

@ -446,7 +446,7 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
{
var info = LookupCompactInfo();
return info != null && info.m_Weight != -1 ? info.m_Weight : DefaultWeight;
return info is { m_Weight: >= 0 } ? info.m_Weight : DefaultWeight;
}
set
{
@ -458,7 +458,7 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
info.m_Weight = value;
if (info.m_Weight == -1)
if (info.m_Weight < 0)
{
VerifyCompactInfo();
}
@ -883,26 +883,23 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
}
}
if (info == null || info.m_Weight == -1.0)
if (info == null || info.m_Weight < 0)
{
flags |= SaveFlag.NullWeight;
}
else
else if (info.m_Weight == 0.0)
{
if (info.m_Weight == 0.0)
flags |= SaveFlag.WeightIs0;
}
else if (info.m_Weight > 0)
{
if (info.m_Weight == (int)info.m_Weight)
{
flags |= SaveFlag.WeightIs0;
flags |= SaveFlag.IntWeight;
}
else if (info.m_Weight != 1.0)
else
{
if (info.m_Weight == (int)info.m_Weight)
{
flags |= SaveFlag.IntWeight;
}
else
{
flags |= SaveFlag.WeightNot1or0;
}
flags |= SaveFlag.WeightNot1or0;
}
}
@ -1607,7 +1604,7 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
flags |= ExpandFlag.TempFlag;
}
if (info.m_Weight != -1)
if (info.m_Weight >= 0)
{
flags |= ExpandFlag.Weight;
}
@ -1642,7 +1639,7 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
|| info.m_Spawner != null
|| info.m_TempFlags != 0
|| info.m_SavedFlags != 0
|| info.m_Weight != -1;
|| info.m_Weight >= 0;
if (!isValid)
{