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

Moves Item/Mobile locks to a handler. (#34)

Browse source
This commit is contained in:
Kamron Batman 2019-03-15 11:05:26 -07:00 • committed by GitHub
parent cf90a58bea
commit de50bc9e43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 876 additions and 1055 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs
View file

@ -177,21 +177,20 @@ namespace Server.Engines.Quests.Doom
Party p = PartySystem.Party.Get(from);
if (p != null)
for (int i = 0; i < p.Members.Count; ++i)
for (int i = 0; i < p?.Members.Count; ++i)
{
PartyMemberInfo pmi = p.Members[i];
Mobile member = pmi.Mobile;
if (member != from && member.Map == Map.Malas && member.Region.IsPartOf("Doom"))
{
PartyMemberInfo pmi = p.Members[i];
Mobile member = pmi.Mobile;
if (AngryAt == member)
AngryAt = null;
if (member != from && member.Map == Map.Malas && member.Region.IsPartOf("Doom"))
{
if (AngryAt == member)
AngryAt = null;
member.CloseGump<ChylothPartyGump>();
member.SendGump(new ChylothPartyGump(from, member));
}
member.CloseGump<ChylothPartyGump>();
member.SendGump(new ChylothPartyGump(from, member));
}
}
if (AngryAt == from)
AngryAt = null;

9
Scripts/Items/Special/House Raffle/HouseRaffleStone.cs
View file

@ -16,10 +16,7 @@ namespace Server.Items
{
From = from;
if (From.NetState != null)
Address = From.NetState.Address;
else
Address = IPAddress.None;
Address = From.NetState?.Address ?? IPAddress.None;
Date = DateTime.UtcNow;
}
@ -367,9 +364,7 @@ namespace Server.Items
public string FormatPrice()
{
if (m_TicketPrice == 0)
return "FREE";
return $"{m_TicketPrice} gold";
return m_TicketPrice == 0 ? "FREE" : $"{m_TicketPrice} gold";
}
public override void GetProperties(ObjectPropertyList list)