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

fix (basecreature): NPE crash for IsFriendPet (#335)

Browse source 
Bumps release for the fix
This commit is contained in:
Kamron Batman 2020-12-07 12:18:09 -08:00 • committed by GitHub
parent 11438fddd0
commit c77b5b1462
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Projects/UOContent/Mobiles/BaseCreature.cs
View file

@ -1791,10 +1791,12 @@ namespace Server.Mobiles
// Version 12
writer.Write(m_Paragon);
// Version 13
writer.Write(Friends?.Count > 0);
var hasFriends = Friends?.Count > 0;
if (Friends?.Count > 0)
// Version 13
writer.Write(hasFriends);
if (hasFriends)
{
writer.Write(Friends, true);
}
@ -4198,7 +4200,7 @@ namespace Server.Mobiles
EndFleeTime = DateTime.UtcNow + maxDuration;
}
public virtual bool IsPetFriend(Mobile m) => Friends.Contains(m);
public virtual bool IsPetFriend(Mobile m) => Friends?.Contains(m) == true;
public virtual void AddPetFriend(Mobile m)
{
@ -4207,10 +4209,7 @@ namespace Server.Mobiles
Friends.Add(m);
}
public virtual void RemovePetFriend(Mobile m)
{
Friends?.Remove(m);
}
public virtual void RemovePetFriend(Mobile m) => Friends?.Remove(m);
public virtual bool IsFriend(Mobile m) =>
OppositionGroup?.IsEnemy(this, m) != true && m is BaseCreature c && m_Team == c.m_Team