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

Fixes FindItemsByType and FindItemByType and new override of IsLockedDown and IsSecure by renaming their methods.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 15:50:35 -07:00
parent 7321fa1b63
commit a48ebb3a5f
50 changed files with 416 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Scripts/Engines/ConPVP/Games/BombingRun.cs
View file

@ -924,9 +924,7 @@ namespace Server.Engines.ConPVP
else
Hue = 0x84C;
if (m.Backpack.FindItemByType(typeof(BRBomb), true) is BRBomb b)
b.CheckScore(this, m, 7);
m.Backpack.FindItemByType<BRBomb>()?.CheckScore(this, m, 7);
return true;
}
}
@ -1487,12 +1485,7 @@ namespace Server.Engines.ConPVP
if (mob?.Backpack == null || GetTeamInfo(mob) == null)
return false;
Item bomb = mob.Backpack.FindItemByType(typeof(BRBomb), true);
if (bomb != null)
return true;
return false;
return mob.Backpack.FindItemByType<BRBomb>() != null;
}
public void ReturnBomb()
@ -1606,22 +1599,17 @@ namespace Server.Engines.ConPVP
bool hadBomb = false;
Item[] bombs = corpse.FindItemsByType(typeof(BRBomb), false);
for (int i = 0; i < bombs.Length; ++i)
(bombs[i] as BRBomb)?.DropTo(mob, killer);
hadBomb = bombs.Length > 0;
if (mob.Backpack != null)
corpse.FindItemsByType<BRBomb>(false).ForEach(bomb =>
{
bombs = mob.Backpack.FindItemsByType(typeof(BRBomb), false);
hadBomb = true;
bomb.DropTo(mob, killer);
});
for (int i = 0; i < bombs.Length; ++i)
(bombs[i] as BRBomb)?.DropTo(mob, killer);
hadBomb = hadBomb || bombs.Length > 0;
}
mob.Backpack?.FindItemsByType<BRBomb>(false).ForEach(bomb =>
{
hadBomb = true;
bomb.DropTo(mob, killer);
});
if (killer != null && killer.Player)
{

23
Scripts/Engines/ConPVP/Games/CTF.cs
View file

@ -965,22 +965,17 @@ namespace Server.Engines.ConPVP
bool hadFlag = false;
Item[] flags = corpse.FindItemsByType(typeof(CTFFlag), false);
for (int i = 0; i < flags.Length; ++i)
(flags[i] as CTFFlag).DropTo(mob, killer);
hadFlag = hadFlag || flags.Length > 0;
if (mob.Backpack != null)
corpse.FindItemsByType<CTFFlag>(false).ForEach(flag =>
{
flags = mob.Backpack.FindItemsByType(typeof(CTFFlag), false);
hadFlag = true;
flag.DropTo(mob, killer);
});
for (int i = 0; i < flags.Length; ++i)
(flags[i] as CTFFlag).DropTo(mob, killer);
hadFlag = hadFlag || flags.Length > 0;
}
mob.Backpack?.FindItemsByType<CTFFlag>(false).ForEach(flag =>
{
hadFlag = true;
flag.DropTo(mob, killer);
});
if (killer != null && killer.Player)
{