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

Fixes parent references. (#15)

Browse source
This commit is contained in:
Kamron Batman 2019-03-03 15:40:17 -08:00 • committed by GitHub
parent 01d0fb75b8
commit 90ffe0ea3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 55 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -45,17 +45,13 @@ namespace Server.Items
int version = reader.ReadInt();
}
public virtual object FindParent(Mobile from)
public virtual IEntity FindParent(Mobile from)
{
Mobile m = HeldBy;
if (HeldBy?.Holding == this)
return HeldBy;
if (m != null && m.Holding == this)
return m;
object obj = RootParent;
if (obj != null)
return obj;
if (RootParent != null)
return RootParent;
if (Map == Map.Internal)
return from;
@ -74,7 +70,7 @@ namespace Server.Items
ThrowTarget targ = from.Target as ThrowTarget;
Stackable = false; // Scavenged explosion potions won't stack with those ones in backpack, and still will explode.
if (targ != null && targ.Potion == this)
if (targ?.Potion == this)
return;
from.RevealingAction();
@ -107,7 +103,7 @@ namespace Server.Items
if (Deleted)
return;
object parent = FindParent(from);
IEntity parent = FindParent(from);
if (timer == 0)
{
@ -272,4 +268,4 @@ namespace Server.Items
}
}
}
}
}