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

Converts equipment packets (#314)

Browse source 
### Change to how DisplayEquipInfo works
* Fixes a bug where raw name wasn't used
* Fixes another bug where an empty, blank, or null string was still sending an empty crafted by property.

Bumps release version
This commit is contained in:
Kamron Batman 2020-11-16 01:04:56 -08:00 • committed by GitHub
parent b0d8dd42c0
commit 1fb7ac5cda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 177 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Projects/Server/Items/Containers.cs
View file

@ -39,7 +39,8 @@ namespace Server.Items
$"Bank container has {TotalItems} items, {TotalWeight} stones",
Owner.NetState
);
Owner.Send(new EquipUpdate(this));
Owner.NetState?.SendEquipUpdate(this);
DisplayTo(Owner);
}
}

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

@ -1450,8 +1450,6 @@ namespace Server
return;
}
Packet p = null;
var eable = map.GetClientsInRange(worldLoc, GetMaxUpdateRange());
foreach (var state in eable)
@ -1471,11 +1469,7 @@ namespace Server
}
else
{
if (p != null)
{
state.Send(p);
}
else if (m_Parent is Item)
if (m_Parent is Item)
{
if (state.ContainerGridLines)
{
@ -1488,10 +1482,8 @@ namespace Server
}
else if (m_Parent is Mobile)
{
p = new EquipUpdate(this);
p.Acquire();
state.Send(p);
// TODO: Optimize by writing once?
state.SendEquipUpdate(this);
}
if (ObjectPropertyList.Enabled)
@ -1502,7 +1494,7 @@ namespace Server
}
else if ((flags & ItemDelta.EquipOnly) != 0 && m_Parent is Mobile)
{
state.Send(p ??= Packet.Acquire(new EquipUpdate(this)));
state.SendEquipUpdate(this);
if (ObjectPropertyList.Enabled)
{
@ -1515,7 +1507,6 @@ namespace Server
}
}
Packet.Release(p);
eable.Free();
}