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

@ -77,8 +77,8 @@ namespace Server.Mobiles
Mobile m = e.Mobile;
Mobile lastKiller = m.LastKiller;
if (lastKiller is BaseCreature)
lastKiller = ((BaseCreature)lastKiller).GetMaster();
if (lastKiller is BaseCreature creature)
lastKiller = creature.GetMaster();
if (IsInsideKhaldun(m) && IsInsideKhaldun(lastKiller) && lastKiller.Player && !m_Set.Contains(lastKiller))
foreach (AggressorInfo ai in m.Aggressors)