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

fix: Fixes boat movement switching (#1458)

Browse source
This commit is contained in:
Kamron Batman 2023-08-16 00:05:07 -07:00 • committed by GitHub
parent 6e23afe7c6
commit 1e422db9e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Projects/UOContent/Multis/Boats/BaseBoat.cs
View file

@ -1372,7 +1372,7 @@ namespace Server.Multis
if (_moveTimer != null)
{
// Do not allow them to travel faster simply by respamming the command
if (_moveTimer.Running && _moveTimer.Interval == interval && _moveTimer.Single == singleNum)
if (_moveTimer.Running && _moveTimer.Interval == interval && _moveTimer.Count == singleNum)
{
return false;
}
@ -1393,9 +1393,17 @@ namespace Server.Multis
}
_moveTimer.Stop();
_moveTimer.Delay = delay;
_moveTimer.Interval = interval;
_moveTimer.Single = singleNum;
// We can reuse the timer if it's not a single count
if (_moveTimer.Count == 0 && singleNum == 0)
{
_moveTimer.Delay = delay;
_moveTimer.Interval = interval;
}
else
{
_moveTimer = new MoveTimer(this, delay, interval, singleNum);
}
}
else
{
@ -2113,23 +2121,12 @@ namespace Server.Multis
}
}
private class MoveTimer : Timer
private class MoveTimer(BaseBoat boat, TimeSpan delay, TimeSpan interval, int single)
: Timer(delay, interval, single)
{
public TimeSpan BoatMoveDelay;
public TimeSpan BoatMoveInterval;
public int Single;
private BaseBoat _boat;
public MoveTimer(BaseBoat boat, TimeSpan delay, TimeSpan interval, int single = 0) : base(delay, interval, single)
{
BoatMoveInterval = interval;
BoatMoveDelay = delay;
Single = single;
_boat = boat;
}
protected override void OnTick()
{
_boat?.StopBoat();
boat?.StopBoat();
}
}