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

@ -142,7 +142,7 @@ namespace Server.Engines.BulkOrders
}
}
public void InvalidateContainers( object parent )
public void InvalidateContainers(IEntity parent)
{
if ( parent is Container c )
{

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;
}
}
}
}

View file

@ -181,7 +181,7 @@ namespace Server.Factions
return false;
}
private Mobile FindOwner(object parent)
private Mobile FindOwner(IEntity parent)
{
if (parent is Item item)
return item.RootParent as Mobile;
@ -453,4 +453,4 @@ namespace Server.Factions
base.Delete();
}
}
}
}

View file

@ -19,33 +19,31 @@ namespace Server.Engines.Quests.Necro
if (m.AccessLevel > AccessLevel.Player)
return true;
bool sendMessage = m.Player;
Mobile mob = m;
if (m is BaseCreature)
m = ((BaseCreature)m).ControlMaster;
if (m is BaseCreature creature)
mob = creature.ControlMaster;
if (m is PlayerMobile pm)
if (!(mob is PlayerMobile pm))
return false;
QuestSystem qs = pm.Quest;
if (qs is DarkTidesQuest)
{
QuestSystem qs = pm.Quest;
QuestObjective obj = qs.FindObjective<SpeakCavePasswordObjective>();
if (qs is DarkTidesQuest)
if (obj?.Completed == true)
{
QuestObjective obj = qs.FindObjective<SpeakCavePasswordObjective>();
m.SendLocalizedMessage(
1060648); // With Horus' permission, you are able to pass through the barrier.
if (obj != null && obj.Completed)
{
if (sendMessage)
m.SendLocalizedMessage(
1060648); // With Horus' permission, you are able to pass through the barrier.
return true;
}
return true;
}
}
if (sendMessage)
m.SendLocalizedMessage(1060649, "",
0x66D); // Without the permission of the guardian Horus, the magic of the barrier prevents your passage.
m.SendLocalizedMessage(1060649, "",
0x66D); // Without the permission of the guardian Horus, the magic of the barrier prevents your passage.
return false;
}
@ -64,4 +62,4 @@ namespace Server.Engines.Quests.Necro
int version = reader.ReadInt();
}
}
}
}

View file

@ -22,10 +22,7 @@ namespace Server.RemoteAdmin
public static void Configure()
{
PacketHandlers.Register(0xF1, 0, false, OnReceive);
#if !MONO
Core.MultiConsoleOut.Add(new EventTextWriter(OnConsoleChar, OnConsoleLine, OnConsoleString));
#endif
Timer.DelayCall(TimeSpan.FromMinutes(2.5), TimeSpan.FromMinutes(2.5), CleanUp);
}
@ -279,4 +276,4 @@ namespace Server.RemoteAdmin
m_OnLine?.Invoke(line);
}
}
}
}