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

fix: Fixes NPE in BaseRanged.OnMiss (#1433)

Browse source
This commit is contained in:
Kamron Batman 2023-07-27 09:17:52 -07:00 • committed by GitHub
parent 72557ffb97
commit 4dddc8d3f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Mobiles;
using Server.Network;
@ -134,8 +135,12 @@ namespace Server.Items
{
var ammo = AmmoType;
pm.RecoverableAmmo.TryGetValue(ammo, out var result);
pm.RecoverableAmmo[ammo] = result + 1;
if (ammo != null)
{
pm.RecoverableAmmo ??= new Dictionary<Type, int>();
pm.RecoverableAmmo.TryGetValue(ammo, out var result);
pm.RecoverableAmmo[ammo] = result + 1;
}
if (!pm.Warmode)
{

4
Projects/UOContent/Mobiles/PlayerMobile.cs
View file

@ -528,7 +528,7 @@ namespace Server.Mobiles
set => SetFlag(PlayerFlag.RefuseTrades, value);
}
public Dictionary<Type, int> RecoverableAmmo { get; } = new();
public Dictionary<Type, int> RecoverableAmmo { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public DateTime AcceleratedStart { get; set; }
@ -3702,7 +3702,7 @@ namespace Server.Mobiles
public void RecoverAmmo()
{
if (!Core.SE || !Alive)
if (!Core.SE || !Alive || RecoverableAmmo == null)
{
return;
}