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

Updates Combat Packets & Moves Tracking to Content (#298)

Browse source 
- [X] Changes outgoing combat packets
- [X] Moves quest arrow to PlayerMobile and moves quest arrow packets to content.

Bumps release version
This commit is contained in:
Kamron Batman 2020-11-01 21:33:01 -08:00 • committed by GitHub
parent 55935d30b4
commit 6f5cb00cdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 373 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Projects/Server/Mobiles/Mobile.cs
View file

@ -562,8 +562,6 @@ namespace Server
private Poison m_Poison;
private Prompt m_Prompt;
private ObjectPropertyList m_PropertyList;
private QuestArrow m_QuestArrow;
private Race m_Race;
private Region m_Region;
@ -955,7 +953,7 @@ namespace Server
if (m_Combatant == null)
{
m_NetState?.Send(new ChangeCombatant(Serial.Zero));
m_NetState?.SendChangeCombatant(Serial.Zero);
m_ExpireCombatant?.Stop();
m_CombatTimer?.Stop();
@ -964,7 +962,7 @@ namespace Server
}
else
{
m_NetState?.Send(new ChangeCombatant(m_Combatant.Serial));
m_NetState?.SendChangeCombatant(m_Combatant.Serial);
m_ExpireCombatant ??= Timer.DelayCall(ExpireCombatantDelay, ExpireCombatant);
m_ExpireCombatant.Start();
@ -1450,10 +1448,7 @@ namespace Server
m_Warmode = value;
Delta(MobileDelta.Flags);
if (m_NetState != null)
{
Send(SetWarMode.Instantiate(value));
}
m_NetState?.SendSetWarMode(value);
if (!m_Warmode)
{
@ -1505,8 +1500,6 @@ namespace Server
m_Target?.Cancel(this, TargetCancelType.Disconnected);
QuestArrow = null;
m_Spell?.OnConnectionChanged();
// if (m_Spell != null)
@ -2010,20 +2003,6 @@ namespace Server
[CommandProperty(AccessLevel.GameMaster)]
public bool Mounted => Mount != null;
public QuestArrow QuestArrow
{
get => m_QuestArrow;
set
{
if (m_QuestArrow != value)
{
m_QuestArrow?.Stop();
m_QuestArrow = value;
}
}
}
public virtual bool CanTarget => true;
public virtual bool ClickTitle => true;
@ -4504,8 +4483,6 @@ namespace Server
}
}
public void ClearQuestArrow() => m_QuestArrow = null;
public void ClearTarget() => m_Target = null;
public Target BeginTarget(int range, bool allowGround, TargetFlags flags, TargetCallback callback) =>