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

Formatting FIxes (#58)

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 • committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/Scripts/Regions/DungeonRegion.cs
View file

@ -27,10 +27,7 @@ namespace Server.Regions
public Map EntranceMap{ get; set; }
public override bool AllowHousing(Mobile from, Point3D p)
{
return false;
}
public override bool AllowHousing(Mobile from, Point3D p) => false;
public override void AlterLightLevel(Mobile m, ref int global, ref int personal)
{

19
Projects/Scripts/Regions/GuardedRegion.cs
View file

@ -14,16 +14,11 @@ namespace Server.Regions
private Dictionary<Mobile, GuardTimer> m_GuardCandidates = new Dictionary<Mobile, GuardTimer>();
private Type m_GuardType;
public GuardedRegion(string name, Map map, int priority, params Rectangle3D[] area) : base(name, map, priority, area)
{
m_GuardType = DefaultGuardType;
}
public GuardedRegion(string name, Map map, int priority, params Rectangle3D[] area) : base(name, map, priority, area) => m_GuardType = DefaultGuardType;
public GuardedRegion(string name, Map map, int priority, params Rectangle2D[] area)
: base(name, map, priority, area)
{
: base(name, map, priority, area) =>
m_GuardType = DefaultGuardType;
}
public GuardedRegion(XmlElement xml, Map map, Region parent) : base(xml, map, parent)
{
@ -61,10 +56,7 @@ namespace Server.Regions
}
}
public virtual bool IsDisabled()
{
return Disabled;
}
public virtual bool IsDisabled() => Disabled;
public static void Initialize()
{
@ -165,10 +157,7 @@ namespace Server.Regions
return base.OnBeginSpellCast(m, s);
}
public override bool AllowHousing(Mobile from, Point3D p)
{
return false;
}
public override bool AllowHousing(Mobile from, Point3D p) => false;
public override void MakeGuard(Mobile focus)
{

10
Projects/Scripts/Regions/HouseRegion.cs
View file

@ -38,10 +38,7 @@ namespace Server.Regions
e.Mobile.Location = house.BanLocation;
}
public override bool AllowHousing(Mobile from, Point3D p)
{
return false;
}
public override bool AllowHousing(Mobile from, Point3D p) => false;
private static Rectangle3D[] GetArea(BaseHouse house)
{
@ -71,10 +68,7 @@ namespace Server.Regions
return true;
}
public override bool CheckAccessibility(Item item, Mobile from)
{
return House.CheckAccessibility(item, from);
}
public override bool CheckAccessibility(Item item, Mobile from) => House.CheckAccessibility(item, from);
// Use OnLocationChanged instead of OnEnter because it can be that we enter a house region even though we're not actually inside the house
public override void OnLocationChanged(Mobile m, Point3D oldLocation)

10
Projects/Scripts/Regions/Jail.cs
View file

@ -24,10 +24,7 @@ namespace Server.Regions
return from.AccessLevel > AccessLevel.Player;
}
public override bool AllowHousing(Mobile from, Point3D p)
{
return false;
}
public override bool AllowHousing(Mobile from, Point3D p) => false;
public override void AlterLightLevel(Mobile m, ref int global, ref int personal)
{
@ -50,9 +47,6 @@ namespace Server.Regions
return from.AccessLevel > AccessLevel.Player;
}
public override bool OnCombatantChange(Mobile from, Mobile Old, Mobile New)
{
return from.AccessLevel > AccessLevel.Player;
}
public override bool OnCombatantChange(Mobile from, Mobile Old, Mobile New) => from.AccessLevel > AccessLevel.Player;
}
}

5
Projects/Scripts/Regions/NoHousingRegion.cs
View file

@ -16,9 +16,6 @@ namespace Server.Regions
public bool SmartChecking => m_SmartChecking;
public override bool AllowHousing(Mobile from, Point3D p)
{
return m_SmartChecking;
}
public override bool AllowHousing(Mobile from, Point3D p) => m_SmartChecking;
}
}

15
Projects/Scripts/Regions/Spawning/SpawnDefinition.cs
View file

@ -186,10 +186,7 @@ namespace Server.Regions
return mobile;
}
protected virtual Mobile CreateMobile()
{
return (Mobile)Activator.CreateInstance(Type);
}
protected virtual Mobile CreateMobile() => (Mobile)Activator.CreateInstance(Type);
}
public class SpawnItem : SpawnType
@ -242,10 +239,7 @@ namespace Server.Regions
return item;
}
protected virtual Item CreateItem()
{
return (Item)Activator.CreateInstance(Type);
}
protected virtual Item CreateItem() => (Item)Activator.CreateInstance(Type);
}
public class SpawnTreasureChest : SpawnItem
@ -265,10 +259,7 @@ namespace Server.Regions
m_Height = TileData.ItemTable[ItemID & TileData.MaxItemValue].Height;
}
protected override Item CreateItem()
{
return new BaseTreasureChest(ItemID, Level);
}
protected override Item CreateItem() => new BaseTreasureChest(ItemID, Level);
}
public class SpawnGroupElement

5
Projects/Scripts/Regions/Spawning/SpawnEntry.cs
View file

@ -84,10 +84,7 @@ namespace Server.Regions
CheckTimer();
}
public Point3D RandomSpawnLocation(int spawnHeight, bool land, bool water)
{
return Region.RandomSpawnLocation(spawnHeight, land, water, HomeLocation, HomeRange);
}
public Point3D RandomSpawnLocation(int spawnHeight, bool land, bool water) => Region.RandomSpawnLocation(spawnHeight, land, water, HomeLocation, HomeRange);
public void Start()
{

10
Projects/Scripts/Regions/Spawning/SpawnPersistence.cs
View file

@ -5,15 +5,9 @@ namespace Server.Regions
{
private static SpawnPersistence m_Instance;
private SpawnPersistence() : base(1)
{
Movable = false;
}
private SpawnPersistence() : base(1) => Movable = false;
public SpawnPersistence(Serial serial) : base(serial)
{
m_Instance = this;
}
public SpawnPersistence(Serial serial) : base(serial) => m_Instance = this;
public SpawnPersistence Instance => m_Instance;