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

Fixes casting checks

Browse source
This commit is contained in:
Kamron Batman 2018-08-19 01:38:55 +08:00
parent 7ea00fbf4f
commit 03dd5f1926
431 changed files with 5616 additions and 6250 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs
View file

@ -110,7 +110,7 @@ namespace Server.Factions
public abstract void DoVisibleEffect();
public abstract void DoAttackEffect( Mobile m );
public virtual int IsValidLocation()
{
return IsValidLocation( GetWorldLocation(), Map );
@ -118,14 +118,14 @@ namespace Server.Factions
public virtual int IsValidLocation( Point3D p, Map m )
{
if( m == null )
if ( m == null )
return 502956; // You cannot place a trap on that.
if( Core.ML )
if ( Core.ML )
{
foreach( Item item in m.GetItemsInRange( p, 0 ) )
{
if( item is BaseFactionTrap && ((BaseFactionTrap)item).Faction == this.Faction )
if ( item is BaseFactionTrap trap && trap.Faction == this.Faction )
return 1075263; // There is already a trap belonging to your faction at this location.;
}
}
@ -282,8 +282,8 @@ namespace Server.Factions
Faction faction = Faction.Find( mob, true );
if ( faction == null && mob is BaseFactionGuard )
faction = ((BaseFactionGuard)mob).Faction;
if ( faction == null && mob is BaseFactionGuard guard )
faction = guard.Faction;
if ( faction == null )
return false;
@ -291,4 +291,4 @@ namespace Server.Factions
return ( faction != m_Faction );
}
}
}
}