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

Code Cleanup & Fixes Warnings (#74)

Browse source
This commit is contained in:
Kamron Batman 2020-01-18 14:56:45 -08:00 • committed by GitHub
parent e11d1f3ad9
commit 57b14ad690
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
143 changed files with 2960 additions and 3427 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs
View file

@ -61,10 +61,10 @@ namespace Server.Mobiles
foreach (Mobile m in eable)
{
if (m == this || !CanBeHarmful(m) ||
!(m is BaseCreature creature && (creature.Controlled || creature.Summoned || creature.Team != Team) ||
m.Player))
!(m.Player || m is BaseCreature creature &&
(creature.Controlled || creature.Summoned || creature.Team != Team)))
continue;
DoHarmful(m);
m.FixedParticles(0x374A, 10, 15, 5013, 0x496, 0, EffectLayer.Waist);
@ -77,7 +77,7 @@ namespace Server.Mobiles
Hits += toDrain;
m.Damage(toDrain, this);
}
eable.Free();
}
@ -109,4 +109,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

2
Projects/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs
View file

@ -184,7 +184,7 @@ namespace Server.Mobiles
continue;
if (m is PlayerMobile pm && pm.Mounted)
pm.Mount.Rider = null;
pm.Mount.Rider = null;
int damage = (int)(m.Hits * 0.6);
if (damage < 10)

3
Projects/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs
View file

@ -76,8 +76,7 @@ namespace Server.Mobiles
{
OpenedBy = from;
if (m_Timer == null)
m_Timer = new DecayTimer(this);
m_Timer ??= new DecayTimer(this);
if (!m_Timer.Running)
m_Timer.Start();

3
Projects/Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs
View file

@ -35,8 +35,7 @@ namespace Server.Mobiles
Body = 0x15;
BaseSoundID = 0xDB;
break;
default:
case 5: // slime
default: // slime
Body = 51;
BaseSoundID = 456;
break;