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

Some cleanup of contains keys and try get values (#246)

Browse source
This commit is contained in:
Kamron Batman 2020-09-13 20:20:44 -07:00 • committed by GitHub
parent 9cbb0cfd23
commit a236617ad9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 3508 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Projects/Server/Items/Container.cs
View file

@ -570,7 +570,7 @@ namespace Server.Items
for (var i = 0; i < stackItems.Count; i++)
{
stackItems[i].m_StackItem.StackWith(@from, stackItems[i].m_DropItem, false);
stackItems[i].m_StackItem.StackWith(from, stackItems[i].m_DropItem, false);
}
return true;
@ -674,7 +674,7 @@ namespace Server.Items
if (CheckContentDisplay(from))
{
LabelTo(@from, "({0} item{2}, {1} stones)", TotalItems, TotalWeight, TotalItems != 1 ? "s" : string.Empty);
LabelTo(from, "({0} item{2}, {1} stones)", TotalItems, TotalWeight, TotalItems != 1 ? "s" : string.Empty);
}
// LabelTo( from, 1050044, String.Format( "{0}\t{1}", TotalItems.ToString(), TotalWeight.ToString() ) );
@ -824,11 +824,11 @@ namespace Server.Items
{
if (from.AccessLevel > AccessLevel.Player || from.InRange(GetWorldLocation(), 2))
{
DisplayTo(@from);
DisplayTo(from);
}
else
{
@from.SendLocalizedMessage(500446); // That is too far away.
from.SendLocalizedMessage(500446); // That is too far away.
}
}

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

@ -2254,11 +2254,11 @@ namespace Server
{
if (m_Parent is Item parentItem)
{
parentItem.GetChildContextMenuEntries(@from, list, item);
parentItem.GetChildContextMenuEntries(from, list, item);
}
else if (m_Parent is Mobile parentMobile)
{
parentMobile.GetChildContextMenuEntries(@from, list, item);
parentMobile.GetChildContextMenuEntries(from, list, item);
}
}
@ -2266,11 +2266,11 @@ namespace Server
{
if (m_Parent is Item item)
{
item.GetChildContextMenuEntries(@from, list, this);
item.GetChildContextMenuEntries(from, list, this);
}
else if (m_Parent is Mobile mobile)
{
mobile.GetChildContextMenuEntries(@from, list, this);
mobile.GetChildContextMenuEntries(from, list, this);
}
}
@ -3241,7 +3241,7 @@ namespace Server
// OSI sends 1074769, bug!
if (QuestItem)
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
1049343
); // You can only drop quest items into the top-most level of your backpack while you still need them for your quest.
}
@ -3667,7 +3667,7 @@ namespace Server
if (target is Container container && p.m_X != -1 && p.m_Y != -1)
{
return OnDroppedInto(@from, container, p);
return OnDroppedInto(from, container, p);
}
return OnDroppedOnto(from, target);
@ -4212,11 +4212,11 @@ namespace Server
{
if (m_Parent is Item parentItem)
{
parentItem.OnItemUsed(@from, item);
parentItem.OnItemUsed(from, item);
}
else if (m_Parent is Mobile parentMobile)
{
parentMobile.OnItemUsed(@from, item);
parentMobile.OnItemUsed(from, item);
}
}
@ -4234,11 +4234,11 @@ namespace Server
{
if (m_Parent is Item parentItem)
{
parentItem.OnItemLifted(@from, item);
parentItem.OnItemLifted(from, item);
}
else if (m_Parent is Mobile parentMobile)
{
parentMobile.OnItemLifted(@from, item);
parentMobile.OnItemLifted(from, item);
}
}
@ -4261,7 +4261,7 @@ namespace Server
{
if (m_Parent is Item parentItem)
{
parentItem.OnSingleClickContained(@from, item);
parentItem.OnSingleClickContained(from, item);
}
}
@ -4271,7 +4271,7 @@ namespace Server
if (opl.Header > 0)
{
@from.Send(
from.Send(
new MessageLocalized(
Serial,
m_ItemID,
@ -4295,7 +4295,7 @@ namespace Server
if (DisplayLootType)
{
LabelLootTypeTo(@from);
LabelLootTypeTo(from);
}
var ns = from.NetState;