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

fix: Fixes NPE in champ titles (#1434)

Browse source
This commit is contained in:
Kamron Batman 2023-07-28 00:39:10 -07:00 • committed by GitHub
parent 51ecee6caa
commit 6547239fa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Distribution/Data/categorization.json
View file

@ -1598,7 +1598,6 @@
{ "type": "ABauble" }, { "type": "ABauble" },
{ "type": "AbscessTail" }, { "type": "AbscessTail" },
{ "type": "AcidProofRope" }, { "type": "AcidProofRope" },
{ "type": "AcidSlime" },
{ "type": "AlbinoCourtesanFish" }, { "type": "AlbinoCourtesanFish" },
{ "type": "AlbinoFrog" }, { "type": "AlbinoFrog" },
{ "type": "AlchemistsBandage" }, { "type": "AlchemistsBandage" },
@ -2078,7 +2077,6 @@
{ "type": "PlayerBBSouth" }, { "type": "PlayerBBSouth" },
{ "type": "PlayingCards" }, { "type": "PlayingCards" },
{ "type": "PlayingCards2" }, { "type": "PlayingCards2" },
{ "type": "PoolOfAcid" },
{ "type": "PortraitOfTheBride" }, { "type": "PortraitOfTheBride" },
{ "type": "PotionKeg" }, { "type": "PotionKeg" },
{ "type": "PottedCactusDeed" }, { "type": "PottedCactusDeed" },

2
Projects/UOContent/Engines/CannedEvil/ChampionTitleContext.cs
View file

@ -352,7 +352,7 @@ public partial class ChampionTitleContext
for (var i = 0; i < ChampionSpawnInfo.Table.Length; i++) for (var i = 0; i < ChampionSpawnInfo.Table.Length; i++)
{ {
ref var title = ref GetTitleValueRef(ChampionSpawnInfo.Table[i].Type); ref var title = ref GetTitleValueRef(ChampionSpawnInfo.Table[i].Type);
if (Unsafe.IsNullRef(ref title)) if (Unsafe.IsNullRef(ref title) || title == null)
{ {
continue; continue;
} }

4
Projects/UOContent/Engines/ML Quests/MLQuestPersistence.cs
View file

@ -4,9 +4,7 @@ namespace Server.Engines.MLQuests
{ {
private static MLQuestPersistence m_Instance; private static MLQuestPersistence m_Instance;
private MLQuestPersistence() private MLQuestPersistence() : base(1) => Movable = false;
: base(1) =>
Movable = false;
public MLQuestPersistence(Serial serial) : base(serial) => m_Instance = this; public MLQuestPersistence(Serial serial) : base(serial) => m_Instance = this;

7
Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs
View file

@ -13,9 +13,6 @@ namespace Server.Mobiles
Body = Core.UOR ? Utility.Random(125, 2) : 0x190; Body = Core.UOR ? Utility.Random(125, 2) : 0x190;
Hue = Core.UOR ? 0 : Race.Human.RandomSkinHue(); Hue = Core.UOR ? 0 : Race.Human.RandomSkinHue();
EquipItem(new Robe(Utility.RandomMetalHue()));
EquipItem(new WizardsHat(Utility.RandomMetalHue()));
SetStr(81, 105); SetStr(81, 105);
SetDex(191, 215); SetDex(191, 215);
SetInt(126, 150); SetInt(126, 150);
@ -44,6 +41,10 @@ namespace Server.Mobiles
VirtualArmor = 16; VirtualArmor = 16;
PackReg(23); PackReg(23);
EquipItem(new Robe(Utility.RandomMetalHue()));
EquipItem(new WizardsHat(Utility.RandomMetalHue()));
if (Utility.RandomBool()) if (Utility.RandomBool())
{ {
EquipItem(new Shoes()); EquipItem(new Shoes());