Fixes brace style (#248)

This commit is contained in:
Kamron Batman 2020-09-13 21:49:46 -07:00 • committed by GitHub
parent a236617ad9
commit 8149620b0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1503 changed files with 28575 additions and 1717 deletions

View file

@ -44,7 +44,9 @@ namespace Server.Multis
public void CheckAddComponents()
{
if (Deleted)
{
return;
}
AddComponents();
}
@ -56,12 +58,16 @@ namespace Server.Multis
public virtual void RefreshDecay(bool setDecayTime)
{
if (Deleted)
{
return;
}
m_DecayTimer?.Stop();
if (setDecayTime)
{
m_DecayTime = DateTime.UtcNow + DecayDelay;
}
m_DecayTimer = Timer.DelayCall(DecayDelay, Delete);
}
@ -88,7 +94,9 @@ namespace Server.Multis
}
if (m is BaseVendor)
{
m.Direction = Direction.South;
}
m.MoveToWorld(loc, Map);
}
@ -109,9 +117,13 @@ namespace Server.Multis
var inNewRange = Utility.InRange(m.Location, Location, EventRange);
if (inNewRange && !inOldRange)
{
OnEnter(m);
}
else if (inOldRange && !inNewRange)
{
OnExit(m);
}
}
public override void OnAfterDelete()
@ -119,16 +131,22 @@ namespace Server.Multis
base.OnAfterDelete();
for (var i = 0; i < m_Items.Count; ++i)
{
m_Items[i].Delete();
}
for (var i = 0; i < m_Mobiles.Count; ++i)
{
var bc = (BaseCreature)m_Mobiles[i];
if (bc.IsPrisoner == false)
{
m_Mobiles[i].Delete();
}
else if (m_Mobiles[i].CantWalk)
{
m_Mobiles[i].Delete();
}
}
m_Items.Clear();
@ -191,7 +209,9 @@ namespace Server.Multis
var version = reader.ReadInt();
if (Weight == 8.0)
{
Weight = 1.0;
}
}
}
}

View file

@ -50,7 +50,10 @@ namespace Server.Multis
AddCampChests();
for (var i = 0; i < 4; i++) AddMobile(Brigands, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
for (var i = 0; i < 4; i++)
{
AddMobile(Brigands, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
}
BaseCreature bc = Utility.Random(2) switch
{
@ -147,7 +150,9 @@ namespace Server.Multis
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset)
{
if (item != null)
{
item.Movable = false;
}
base.AddItem(item, xOffset, yOffset, zOffset);
}

View file

@ -53,7 +53,10 @@ namespace Server.Multis
AddCampChests();
for (var i = 0; i < 4; i++) AddMobile(Lizardmen, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
for (var i = 0; i < 4; i++)
{
AddMobile(Lizardmen, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
}
m_Prisoner = Utility.Random(2) switch
{
@ -111,6 +114,7 @@ namespace Server.Multis
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{
case 0:
@ -126,6 +130,7 @@ namespace Server.Multis
crates.DropItem(new LesserPoisonPotion());
break;
}
}
AddItem(crates, -2, 2, 0);
}
@ -159,7 +164,9 @@ namespace Server.Multis
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset)
{
if (item != null)
{
item.Movable = false;
}
base.AddItem(item, xOffset, yOffset, zOffset);
}

View file

@ -53,7 +53,11 @@ namespace Server.Multis
AddCampChests();
for (var i = 0; i < 3; i++) AddMobile(Orcs, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
for (var i = 0; i < 3; i++)
{
AddMobile(Orcs, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
}
AddMobile(new OrcCaptain(), 2, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
m_Prisoner = Utility.Random(2) switch
@ -112,6 +116,7 @@ namespace Server.Multis
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{
case 0:
@ -127,6 +132,7 @@ namespace Server.Multis
crates.DropItem(new LesserPoisonPotion());
break;
}
}
AddItem(crates, 2, -2, 0);
}
@ -160,7 +166,9 @@ namespace Server.Multis
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset)
{
if (item != null)
{
item.Movable = false;
}
base.AddItem(item, xOffset, yOffset, zOffset);
}

View file

@ -53,7 +53,10 @@ namespace Server.Multis
AddCampChests();
for (var i = 0; i < 4; i++) AddMobile(Ratmen, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
for (var i = 0; i < 4; i++)
{
AddMobile(Ratmen, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
}
m_Prisoner = Utility.Random(2) switch
{
@ -111,6 +114,7 @@ namespace Server.Multis
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{
case 0:
@ -126,6 +130,7 @@ namespace Server.Multis
crates.DropItem(new LesserPoisonPotion());
break;
}
}
AddItem(crates, 2, 2, 0);
}
@ -159,7 +164,9 @@ namespace Server.Multis
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset)
{
if (item != null)
{
item.Movable = false;
}
base.AddItem(item, xOffset, yOffset, zOffset);
}