Merges bug fixes and cleanup with master (#17)

This commit is contained in:
Kamron Batman 2019-03-03 15:50:57 -08:00 • committed by GitHub
parent 39dfe86e10
commit 55136d8842
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 157 additions and 234 deletions

View file

@ -44,7 +44,7 @@ namespace Server.Engines.ConPVP
public Mobile Thrower{ get; private set; }
private Mobile FindOwner(object parent)
private Mobile FindOwner(IEntity parent)
{
if (parent is Item item)
return item.RootParent as Mobile;

View file

@ -455,7 +455,7 @@ namespace Server.Engines.ConPVP
MoveToWorld(m_TeamInfo.Origin, m_TeamInfo.Game.Facet);
}
private Mobile FindOwner(object parent)
private Mobile FindOwner(IEntity parent)
{
if (parent is Item item)
return item.RootParent as Mobile;
@ -1199,4 +1199,4 @@ namespace Server.Engines.ConPVP
m_FinishTimer = null;
}
}
}
}