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

Cleanup and adds configuration for crashguard (#240)

Browse source
This commit is contained in:
Kamron Batman 2020-09-12 01:57:07 -07:00 • committed by GitHub
parent 55ae0f8778
commit 7dbfa086bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 1248 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Items/Containers/Container.cs
View file

@ -234,7 +234,7 @@ namespace Server.Items
base.CheckHold(m, item, false, checkItems, plusItems, plusWeight);
public override bool CheckContentDisplay(Mobile from) =>
RootParent is BaseCreature creature && creature.Controlled && creature.ControlMaster == @from ||
RootParent is BaseCreature creature && creature.Controlled && creature.ControlMaster == from ||
base.CheckContentDisplay(from);
public override void Serialize(IGenericWriter writer)

4
Projects/UOContent/Items/Containers/SalvageBag.cs
View file

@ -180,8 +180,8 @@ namespace Server.Items
if (item?.Deleted != false)
continue;
if (item is BaseArmor armor && Resmelt(@from, armor, armor.Resource) ||
item is BaseWeapon weapon && Resmelt(@from, weapon, weapon.Resource) ||
if (item is BaseArmor armor && Resmelt(from, armor, armor.Resource) ||
item is BaseWeapon weapon && Resmelt(from, weapon, weapon.Resource) ||
item is DragonBardingDeed)
salvaged++;
else