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

Fixes null propogation

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 13:49:23 -07:00
parent 22ab83ea9e
commit 3c9842ee5a
218 changed files with 799 additions and 1458 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Scripts/Items/Addons/AddonComponent.cs
View file

@ -151,8 +151,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( m_Addon != null )
m_Addon.OnComponentUsed( this, from );
m_Addon?.OnComponentUsed( this, @from );
}
public void OnChop( Mobile from )
@ -179,8 +178,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Addon != null )
m_Addon.Delete();
m_Addon?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -207,8 +205,7 @@ namespace Server.Items
m_Addon = reader.ReadItem() as BaseAddon;
m_Offset = reader.ReadPoint3D();
if ( m_Addon != null )
m_Addon.OnComponentLoaded( this );
m_Addon?.OnComponentLoaded( this );
ApplyLightTo( this );

12
Scripts/Items/Addons/AddonContainerComponent.cs
View file

@ -60,8 +60,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( m_Addon != null )
m_Addon.OnComponentUsed( this, from );
m_Addon?.OnComponentUsed( this, @from );
}
public override void OnLocationChange( Point3D old )
@ -72,8 +71,7 @@ namespace Server.Items
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
{
if ( m_Addon != null )
m_Addon.GetContextMenuEntries( from, list );
m_Addon?.GetContextMenuEntries( @from, list );
}
public override void OnMapChange()
@ -86,8 +84,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Addon != null )
m_Addon.Delete();
m_Addon?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -109,8 +106,7 @@ namespace Server.Items
m_Addon = reader.ReadItem() as BaseAddonContainer;
m_Offset = reader.ReadPoint3D();
if ( m_Addon != null )
m_Addon.OnComponentLoaded( this );
m_Addon?.OnComponentLoaded( this );
AddonComponent.ApplyLightTo( this );
}

3
Scripts/Items/Addons/BaseAddonContainer.cs
View file

@ -96,8 +96,7 @@ namespace Server.Items
{
BaseHouse house = BaseHouse.FindHouseAt( this );
if ( house != null )
house.Addons.Remove( this );
house?.Addons.Remove( this );
base.OnDelete();
}

3
Scripts/Items/Addons/ElvenSpinningwheelEastAddon.cs
View file

@ -77,8 +77,7 @@ namespace Server.Items
}
}
if ( callback != null )
callback( this, from, hue );
callback?.Invoke( this, @from, hue );
}
private class SpinTimer : Timer

3
Scripts/Items/Addons/ElvenSpinningwheelSouthAddon.cs
View file

@ -79,8 +79,7 @@ namespace Server.Items
}
}
if ( callback != null )
callback( this, from, hue );
callback?.Invoke( this, @from, hue );
}
private class SpinTimer : Timer

3
Scripts/Items/Addons/SpinningwheelEastAddon.cs
View file

@ -87,8 +87,7 @@ namespace Server.Items
}
}
if ( callback != null )
callback( this, from, hue );
callback?.Invoke( this, @from, hue );
}
private class SpinTimer : Timer

3
Scripts/Items/Addons/SpinningwheelSouthAddon.cs
View file

@ -79,8 +79,7 @@ namespace Server.Items
}
}
if ( callback != null )
callback( this, from, hue );
callback?.Invoke( this, @from, hue );
}
private class SpinTimer : Timer

6
Scripts/Items/Aquarium/Aquarium.cs
View file

@ -822,8 +822,7 @@ namespace Server.Items
if ( IsFull || m_LiveCreatures >= MaxLiveCreatures || fish.Dead )
{
if ( from != null )
from.SendLocalizedMessage( 1073633 ); // The aquarium can not hold the creature.
@from?.SendLocalizedMessage( 1073633 ); // The aquarium can not hold the creature.
return false;
}
@ -833,8 +832,7 @@ namespace Server.Items
m_LiveCreatures += 1;
if ( from != null )
from.SendLocalizedMessage( 1073632, $"#{fish.LabelNumber}"); // You add the following creature to your aquarium: ~1_FISH~
@from?.SendLocalizedMessage( 1073632, $"#{fish.LabelNumber}"); // You add the following creature to your aquarium: ~1_FISH~
InvalidateProperties();
return true;

14
Scripts/Items/Armor/BaseArmor.cs
View file

@ -620,13 +620,10 @@ namespace Server.Items
CraftResourceInfo info = CraftResources.GetInfo( m_Resource );
if ( info != null )
{
CraftAttributeInfo attrInfo = info.AttributeInfo;
CraftAttributeInfo attrInfo = info?.AttributeInfo;
if ( attrInfo != null )
v += attrInfo.ArmorLowerRequirements;
}
if ( attrInfo != null )
v += attrInfo.ArmorLowerRequirements;
if ( v > 100 )
v = 100;
@ -1382,10 +1379,7 @@ namespace Server.Items
{
CraftResourceInfo resInfo = CraftResources.GetInfo( m_Resource );
if ( resInfo == null )
return 0;
CraftAttributeInfo attrInfo = resInfo.AttributeInfo;
CraftAttributeInfo attrInfo = resInfo?.AttributeInfo;
if ( attrInfo == null )
return 0;

3
Scripts/Items/Clothing/BaseClothing.cs
View file

@ -558,8 +558,7 @@ namespace Server.Items
if ( RequiredRace == Race.Elf )
list.Add( 1075086 ); // Elves Only
if ( m_AosSkillBonuses != null )
m_AosSkillBonuses.GetProperties( list );
m_AosSkillBonuses?.GetProperties( list );
int prop;

6
Scripts/Items/Clothing/OuterTorso.cs
View file

@ -128,8 +128,7 @@ namespace Server.Items
private void BeginDecay( TimeSpan delay )
{
if ( m_DecayTimer != null )
m_DecayTimer.Stop();
m_DecayTimer?.Stop();
m_DecayTime = DateTime.UtcNow + delay;
@ -157,8 +156,7 @@ namespace Server.Items
public override void OnAfterDelete()
{
if ( m_DecayTimer != null )
m_DecayTimer.Stop();
m_DecayTimer?.Stop();
m_DecayTimer = null;
}

12
Scripts/Items/Construction/Ankhs.cs
View file

@ -159,8 +159,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -212,8 +211,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
@ -327,8 +325,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -382,8 +379,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement

24
Scripts/Items/Construction/Decorative/DecorativeWeapon.cs
View file

@ -144,8 +144,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -196,8 +195,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -251,8 +249,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -303,8 +300,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -358,8 +354,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -410,8 +405,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -465,8 +459,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -517,8 +510,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )

66
Scripts/Items/Construction/Decorative/Tapestry.cs
View file

@ -32,8 +32,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -84,8 +83,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -140,8 +138,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -192,8 +189,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -247,8 +243,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -299,8 +294,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -355,8 +349,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -407,8 +400,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -463,8 +455,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -515,8 +506,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -571,8 +561,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -623,8 +612,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -678,8 +666,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -731,8 +718,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -787,8 +773,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -839,8 +824,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -894,8 +878,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -947,8 +930,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -1003,8 +985,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -1055,8 +1036,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -1110,8 +1090,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -1163,8 +1142,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )

3
Scripts/Items/Containers/MarkContainer.cs
View file

@ -157,8 +157,7 @@ namespace Server.Items
public void StopTimer()
{
if ( m_RelockTimer != null )
m_RelockTimer.Stop();
m_RelockTimer?.Stop();
m_RelockTimer = null;
}

8
Scripts/Items/Decoration Artifacts/StealableArtifactsSpawner.cs
View file

@ -240,10 +240,7 @@ namespace Server.Items
public static StealableInstance GetStealableInstance( Item item )
{
if ( Instance == null )
return null;
return (StealableInstance) Instance.m_Table[item];
return (StealableInstance) Instance?.m_Table[item];
}
@ -341,8 +338,7 @@ namespace Server.Items
foreach ( StealableInstance si in m_Artifacts )
{
if ( si.Item != null )
si.Item.Delete();
si.Item?.Delete();
}
m_Instance = null;

3
Scripts/Items/Deeds/CommodityDeed.cs
View file

@ -83,8 +83,7 @@ namespace Server.Items
public override void OnDelete()
{
if ( m_Commodity != null )
m_Commodity.Delete();
m_Commodity?.Delete();
base.OnDelete();
}

5
Scripts/Items/Deeds/VendorRentalContract.cs
View file

@ -139,10 +139,7 @@ namespace Server.Items
{
BaseHouse house = BaseHouse.FindHouseAt( this );
if ( house != null )
{
house.VendorRentalContracts.Remove( this );
}
house?.VendorRentalContracts.Remove( this );
}
}

3
Scripts/Items/Farming/FarmableCrop.cs
View file

@ -35,8 +35,7 @@ namespace Server.Items
Item spawn = GetCropObject();
if ( spawn != null )
spawn.MoveToWorld( loc, map );
spawn?.MoveToWorld( loc, map );
m_Picked = true;

3
Scripts/Items/Games/Mahjong/MahjongPacketHandlers.cs
View file

@ -47,8 +47,7 @@ namespace Server.Engines.Mahjong
{
MahjongGame game = World.FindItem( pvSrc.ReadInt32() ) as MahjongGame;
if ( game != null )
game.Players.CheckPlayers();
game?.Players.CheckPlayers();
pvSrc.ReadByte();

3
Scripts/Items/Maps/TreasureMap.cs
View file

@ -470,8 +470,7 @@ namespace Server.Items
Stop();
m_From.EndAction( typeof( TreasureMap ) );
if ( m_Chest != null )
m_Chest.Delete();
m_Chest?.Delete();
if ( m_Dirt1 != null )
{

6
Scripts/Items/Misc/Corpses/Corpse.cs
View file

@ -368,8 +368,7 @@ namespace Server.Items
public void BeginDecay( TimeSpan delay )
{
if ( m_DecayTimer != null )
m_DecayTimer.Stop();
m_DecayTimer?.Stop();
m_DecayTime = DateTime.UtcNow + delay;
@ -379,8 +378,7 @@ namespace Server.Items
public override void OnAfterDelete()
{
if ( m_DecayTimer != null )
m_DecayTimer.Stop();
m_DecayTimer?.Stop();
m_DecayTimer = null;
}

6
Scripts/Items/Misc/Corpses/DecayedCorpse.cs
View file

@ -19,8 +19,7 @@ namespace Server.Items
public void BeginDecay( TimeSpan delay )
{
if ( m_DecayTimer != null )
m_DecayTimer.Stop();
m_DecayTimer?.Stop();
m_DecayTime = DateTime.UtcNow + delay;
@ -30,8 +29,7 @@ namespace Server.Items
public override void OnAfterDelete()
{
if ( m_DecayTimer != null )
m_DecayTimer.Stop();
m_DecayTimer?.Stop();
m_DecayTimer = null;
}

6
Scripts/Items/Misc/SerpentPillar.cs
View file

@ -62,8 +62,7 @@ namespace Server.Items
if ( !Active )
{
if ( boat.TillerMan != null )
boat.TillerMan.Say( 502507 ); // Ar, Legend has it that these pillars are inactive! No man knows how it might be undone!
boat.TillerMan?.Say( 502507 ); // Ar, Legend has it that these pillars are inactive! No man knows how it might be undone!
return;
}
@ -90,8 +89,7 @@ namespace Server.Items
}
}
if ( boat.TillerMan != null )
boat.TillerMan.Say( 502508 ); // Ar, I refuse to take that matey through here!
boat.TillerMan?.Say( 502508 ); // Ar, I refuse to take that matey through here!
}
}

3
Scripts/Items/Misc/Teleporter.cs
View file

@ -862,8 +862,7 @@ namespace Server.Items
public override bool OnMoveOver(Mobile m)
{
if (m_Teleporter != null)
m_Teleporter.StopTimer(m);
m_Teleporter?.StopTimer(m);
return true;
}

24
Scripts/Items/Skill Items/Blacksmith Items/Misc/LargeForge.cs
View file

@ -39,10 +39,8 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
if ( m_Item2 != null )
m_Item2.Delete();
m_Item?.Delete();
m_Item2?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -97,8 +95,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -152,8 +149,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -215,10 +211,8 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
if ( m_Item2 != null )
m_Item2.Delete();
m_Item?.Delete();
m_Item2?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -273,8 +267,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -328,8 +321,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )

6
Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -206,8 +206,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Timer != null )
m_Timer.Stop();
m_Timer?.Stop();
}
public InternalItem( Serial serial ) : base( serial )
@ -316,8 +315,7 @@ namespace Server.Items
if ( (m.Z + 16) > m_Item.Z && (m_Item.Z + 12) > m.Z && (!Core.AOS || m != from) && SpellHelper.ValidIndirectTarget( from, m ) && from.CanBeHarmful( m, false ) )
{
if ( from != null )
from.DoHarmful( m );
@from?.DoHarmful( m );
AOS.Damage( m, from, m_Item.GetDamage(), 0, 100, 0, 0, 0 );
m.PlaySound( 0x208 );

3
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -104,8 +104,7 @@ namespace Server.Items
Spellbook book = Find( from, -1, type );
if ( book != null )
book.DisplayTo( from );
book?.DisplayTo( @from );
}
private static void EventSink_CastSpellRequest( CastSpellRequestEventArgs e )

11
Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -153,8 +153,7 @@ namespace Server.Items
}
else
{
if ( from != null )
from.SendLocalizedMessage( 502079 ); // The instrument played its last tune.
@from?.SendLocalizedMessage( 502079 ); // The instrument played its last tune.
Delete();
}
@ -187,8 +186,7 @@ namespace Server.Items
if ( instrument != null )
{
if ( callback != null )
callback( from, instrument );
callback?.Invoke( @from, instrument );
}
else
{
@ -233,10 +231,7 @@ namespace Server.Items
public static int GetPoisonLevel( BaseCreature bc )
{
if ( bc == null )
return 0;
Poison p = bc.HitPoison;
Poison p = bc?.HitPoison;
if ( p == null )
return 0;

3
Scripts/Items/Skill Items/Thief/DisguiseKit.cs
View file

@ -309,8 +309,7 @@ namespace Server.Items
{
m_Timers.TryGetValue( m, out Timer t );
if ( t != null )
t.Start();
t?.Start();
}
public static bool IsDisguised( Mobile m )

10
Scripts/Items/Skill Items/Tools/BaseRunicTool.cs
View file

@ -239,10 +239,7 @@ namespace Server.Items
{
CraftResourceInfo resInfo = CraftResources.GetInfo( m_Resource );
if ( resInfo == null )
return;
CraftAttributeInfo attrs = resInfo.AttributeInfo;
CraftAttributeInfo attrs = resInfo?.AttributeInfo;
if ( attrs == null )
return;
@ -438,10 +435,7 @@ namespace Server.Items
{
CraftResourceInfo resInfo = CraftResources.GetInfo( m_Resource );
if ( resInfo == null )
return;
CraftAttributeInfo attrs = resInfo.AttributeInfo;
CraftAttributeInfo attrs = resInfo?.AttributeInfo;
if ( attrs == null )
return;

6
Scripts/Items/Special/Evil Home Decor Collection/SacrificialAltar.cs
View file

@ -39,8 +39,7 @@ namespace Server.Items
{
SendLocalizedMessageTo( from, 1010442 ); // The item will be deleted in three minutes
if ( m_Timer != null )
m_Timer.Stop();
m_Timer?.Stop();
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), new TimerCallback( Empty ) );
}
@ -62,8 +61,7 @@ namespace Server.Items
{
SendLocalizedMessageTo( from, 1010442 ); // The item will be deleted in three minutes
if ( m_Timer != null )
m_Timer.Stop();
m_Timer?.Stop();
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), new TimerCallback( Empty ) );
}

18
Scripts/Items/Special/Mutation Core/PlagueBeastBlood.cs
View file

@ -47,17 +47,14 @@ namespace Server.Items
ItemID = 0x1765;
if ( Owner != null )
{
Container pack = Owner.Backpack;
Container pack = Owner?.Backpack;
if ( pack != null )
if ( pack != null )
{
for ( int i = 0; i < pack.Items.Count; i++ )
{
for ( int i = 0; i < pack.Items.Count; i++ )
{
if ( pack.Items[ i ] is PlagueBeastMainOrgan main && main.Complete )
main.FinishOpening( from );
}
if ( pack.Items[ i ] is PlagueBeastMainOrgan main && main.Complete )
main.FinishOpening( @from );
}
}
@ -74,8 +71,7 @@ namespace Server.Items
if ( Patched )
return;
if ( Owner != null )
Owner.PlaySound( 0x25 );
Owner?.PlaySound( 0x25 );
if ( ItemID == 0x122A )
{

9
Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs
View file

@ -98,8 +98,7 @@ namespace Server.Items
{
m_Opened = true;
if ( Owner != null )
Owner.PlaySound( 0x50 );
Owner?.PlaySound( 0x50 );
}
public PlagueBeastOrgan( Serial serial ) : base( serial )
@ -145,8 +144,7 @@ namespace Server.Items
{
ItemID = 0x1249;
if ( Owner != null )
Owner.PlaySound( 0x187 );
Owner?.PlaySound( 0x187 );
AddComponent( new PlagueBeastComponent( 0x1D0D, 0x0 ), 22, 3 );
AddComponent( new PlagueBeastComponent( 0x1D12, 0x0 ), 15, 18 );
@ -398,8 +396,7 @@ namespace Server.Items
from.SendAsciiMessage( 0x3B2, "* You place the healthy gland inside the organ sac *" );
item.Movable = false;
if ( Owner != null )
Owner.PlaySound( 0x20 );
Owner?.PlaySound( 0x20 );
return true;
}

3
Scripts/Items/Special/Mutation Core/PlagueBeastVein.cs
View file

@ -48,8 +48,7 @@ namespace Server.Items
else
ItemID = 0x1B1C;
if ( Owner != null )
Owner.PlaySound( 0x199 );
Owner?.PlaySound( 0x199 );
if ( Organ is PlagueBeastRubbleOrgan organ )
organ.OnVeinCut( from, this );

3
Scripts/Items/Special/Veteran Rewards/Brazier.cs
View file

@ -92,8 +92,7 @@ namespace Server.Items
public override void OnLocationChange( Point3D old )
{
if ( m_Fire != null )
m_Fire.MoveToWorld( new Point3D( X, Y, Z + ItemData.Height ), Map );
m_Fire?.MoveToWorld( new Point3D( X, Y, Z + ItemData.Height ), Map );
}
public override void GetProperties( ObjectPropertyList list )

5
Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs
View file

@ -168,10 +168,7 @@ namespace Server.Items
public static WeaponEngravingTool Find( Mobile from )
{
if ( from.Backpack != null )
return from.Backpack.FindItemByType( typeof( WeaponEngravingTool ) ) as WeaponEngravingTool;
return null;
return @from.Backpack?.FindItemByType( typeof( WeaponEngravingTool ) ) as WeaponEngravingTool;
}
private class TargetWeapon : Target

3
Scripts/Items/Talismans/BaseTalisman.cs
View file

@ -727,8 +727,7 @@ namespace Server.Items
public virtual void StopTimer()
{
if (m_Timer != null)
m_Timer.Stop();
m_Timer?.Stop();
m_Timer = null;
}

9
Scripts/Items/Traps/FlameSpurtTrap.cs
View file

@ -68,8 +68,7 @@ namespace Server.Items
{
base.OnDelete();
if ( m_Spurt != null )
m_Spurt.Delete();
m_Spurt?.Delete();
}
public virtual void Refresh()
@ -93,8 +92,7 @@ namespace Server.Items
if ( !foundPlayer )
{
if ( m_Spurt != null )
m_Spurt.Delete();
m_Spurt?.Delete();
m_Spurt = null;
}
@ -167,8 +165,7 @@ namespace Server.Items
{
Item item = reader.ReadItem();
if ( item != null )
item.Delete();
item?.Delete();
CheckTimer();

6
Scripts/Items/Weapons/Abilities/MortalStrike.cs
View file

@ -50,8 +50,7 @@ namespace Server.Items
{
Timer t = (Timer)m_Table[m];
if ( t != null )
t.Stop();
t?.Stop();
t = new InternalTimer( m, duration );
m_Table[m] = t;
@ -68,8 +67,7 @@ namespace Server.Items
Timer t = (Timer)m_Table[m];
if ( t != null )
t.Stop();
t?.Stop();
m_Table.Remove( m );

6
Scripts/Items/Weapons/Abilities/ParalyzingBlow.cs
View file

@ -96,8 +96,7 @@ namespace Server.Items
{
Timer t = (Timer)m_Table[m];
if ( t != null )
t.Stop();
t?.Stop();
t = new InternalTimer( m, duration );
m_Table[m] = t;
@ -109,8 +108,7 @@ namespace Server.Items
{
Timer t = (Timer)m_Table[m];
if ( t != null )
t.Stop();
t?.Stop();
m_Table.Remove( m );
}