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

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Projects/Scripts/Items/Containers/Container.cs
View file

@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using Server.ContextMenus;
using Server.Mobiles;
using Server.Multis;
@ -17,17 +16,40 @@ namespace Server.Items
{
}
public override int DefaultMaxWeight => IsSecure ? 0 : base.DefaultMaxWeight;
public override int DefaultMaxWeight
{
get
{
if (IsSecure)
return 0;
public override bool IsAccessibleTo(Mobile m) =>
BaseHouse.CheckAccessible(m, this) && base.IsAccessibleTo(m);
return base.DefaultMaxWeight;
}
}
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight) =>
(!IsSecure || BaseHouse.CheckHold(m, this, item, message, checkItems, plusItems, plusWeight)) &&
base.CheckHold(m, item, message, checkItems, plusItems, plusWeight);
public override bool IsAccessibleTo(Mobile m)
{
if (!BaseHouse.CheckAccessible(m, this))
return false;
public override bool CheckItemUse(Mobile from, Item item) =>
IsDecoContainer && item is BaseBook || base.CheckItemUse(from, item);
return base.IsAccessibleTo(m);
}
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
{
if (IsSecure && !BaseHouse.CheckHold(m, this, item, message, checkItems, plusItems, plusWeight))
return false;
return base.CheckHold(m, item, message, checkItems, plusItems, plusWeight);
}
public override bool CheckItemUse(Mobile from, Item item)
{
if (IsDecoContainer && item is BaseBook)
return true;
return base.CheckItemUse(from, item);
}
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{
@ -57,8 +79,13 @@ namespace Server.Items
List<Item> list = Items;
if (list.Any(item => !(item is Container) && item.StackWith(from, dropped, false)))
return true;
for (int i = 0; i < list.Count; ++i)
{
Item item = list[i];
if (!(item is Container) && item.StackWith(from, dropped, false))
return true;
}
DropItem(dropped);
@ -909,4 +936,4 @@ namespace Server.Items
Weight = -1;
}
}
}
}