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

fix: Reverts PR #96 (#599)

Browse source
This commit is contained in:
Kamron Batman 2021-05-12 21:51:56 -07:00 • committed by GitHub
parent ce86f377f0
commit 6dcf3aafe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Projects/UOContent/Gumps/Props/PropsGump.cs
View file

@ -229,8 +229,9 @@ namespace Server.Gumps
var cpa = GetCPA(prop); var cpa = GetCPA(prop);
if (!prop.GetType().IsValueType && prop.CanWrite && // !prop.GetType().IsValueType
m_Mobile.AccessLevel >= cpa?.WriteLevel && !cpa.ReadOnly)
if (prop.CanWrite && m_Mobile.AccessLevel >= cpa?.WriteLevel && !cpa.ReadOnly)
{ {
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, i + 3); AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, i + 3);
} }
@ -296,7 +297,7 @@ namespace Server.Gumps
var attr = GetCPA(prop); var attr = GetCPA(prop);
if (prop.GetType().IsValueType || !prop.CanWrite || attr == null || if (!prop.CanWrite || attr == null ||
from.AccessLevel < attr.WriteLevel || attr.ReadOnly) from.AccessLevel < attr.WriteLevel || attr.ReadOnly)
{ {
return; return;
@ -403,14 +404,11 @@ namespace Server.Gumps
{ {
var obj = prop.GetValue(m_Object, null); var obj = prop.GetValue(m_Object, null);
if (obj != null) from.SendGump(
{ obj != null
from.SendGump(new PropertiesGump(from, obj, m_Stack, new StackEntry(m_Object, prop))); ? new PropertiesGump(from, obj, m_Stack, new StackEntry(m_Object, prop))
} : new PropertiesGump(from, m_Object, m_Stack, m_List, m_Page)
else );
{
from.SendGump(new PropertiesGump(from, m_Object, m_Stack, m_List, m_Page));
}
} }
break; break;