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

Merges bug fixes and cleanup with master (#17)

Browse source
This commit is contained in:
Kamron Batman 2019-03-03 15:50:57 -08:00 • committed by GitHub
parent 39dfe86e10
commit 55136d8842
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 157 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Server/Items/Container.cs
View file

@ -233,7 +233,7 @@ namespace Server.Items
}
}
object parent = Parent;
IEntity parent = Parent;
while (parent != null)
{
@ -627,15 +627,9 @@ namespace Server.Items
public virtual bool CheckContentDisplay(Mobile from)
{
if (DisplaysContent)
{
object root = RootParent;
if (root == null || root is Item || root == from || from.AccessLevel > AccessLevel.Player)
return true;
}
return false;
return DisplaysContent && RootParent == null ||
RootParent is Item || RootParent == from ||
from.AccessLevel > AccessLevel.Player;
}
public override void OnSingleClick(Mobile from)