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

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Projects/Server/Targeting/MultiTarget.cs
View file

@ -24,10 +24,10 @@ namespace Server.Targeting
{
public abstract class MultiTarget : Target
{
protected MultiTarget(int multiId, Point3D offset, int range = 10, bool allowGround = true, TargetFlags flags = TargetFlags.None)
protected MultiTarget(int multiID, Point3D offset, int range = 10, bool allowGround = true, TargetFlags flags = TargetFlags.None)
: base(range, allowGround, flags)
{
MultiID = multiId;
MultiID = multiID;
Offset = offset;
}
@ -35,12 +35,11 @@ namespace Server.Targeting
public Point3D Offset{ get; set; }
public override void Send(NetState ns)
public override Packet GetPacketFor(NetState ns)
{
if (ns.HighSeas)
Packets.SendMultiTargetReqHS(ns, this);
else
Packets.SendMultiTargetReq(ns, this);
return new MultiTargetReqHS(this);
return new MultiTargetReq(this);
}
}
}

6
Projects/Server/Targeting/Target.cs
View file

@ -25,13 +25,13 @@ namespace Server.Targeting
{
public abstract class Target
{
private static int _nextTargetId;
private static int m_NextTargetID;
private Timer m_TimeoutTimer;
protected Target(int range, bool allowGround, TargetFlags flags)
{
TargetID = ++_nextTargetId;
TargetID = ++m_NextTargetID;
Range = range;
AllowGround = allowGround;
Flags = flags;
@ -57,7 +57,7 @@ namespace Server.Targeting
public static void Cancel(Mobile m)
{
Packets.SendCancelTarget(m.NetState);
m.NetState?.Send(CancelTarget.Instance);
m.Target?.OnTargetCancel(m, TargetCancelType.Canceled);
}