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

fix: Fixes boat component locations when moving (#1868)

Browse source
This commit is contained in:
Kamron Batman 2024-07-09 19:34:57 -07:00 • committed by GitHub
parent 21836cf62f
commit 8ac9ec27e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ using Server.Engines.Spawners;
using Server.Items;
using Server.Multis.Boats;
using Server.Network;
using CalcMoves = Server.Movement.Movement;
namespace Server.Multis
{
@ -282,15 +283,15 @@ namespace Server.Multis
SPlank.SetFacing(_facing);
}
var xOffset = X;
var yOffset = Y;
Movement.Movement.Offset(_facing, ref xOffset, ref yOffset);
var xOffset = 0;
var yOffset = 0;
CalcMoves.Offset(_facing, ref xOffset, ref yOffset);
if (TillerMan != null)
{
TillerMan.Location = new Point3D(
xOffset * TillerManDistance + (_facing == Direction.North ? 1 : 0),
yOffset * TillerManDistance,
X + xOffset * TillerManDistance + (_facing == Direction.North ? 1 : 0),
Y + yOffset * TillerManDistance,
TillerMan.Z
);
TillerMan.SetFacing(_facing);
@ -299,7 +300,7 @@ namespace Server.Multis
if (Hold != null)
{
Hold.Location = new Point3D(xOffset * HoldDistance, yOffset * HoldDistance, Hold.Z);
Hold.Location = new Point3D(X + xOffset * HoldDistance, Y + yOffset * HoldDistance, Hold.Z);
Hold.SetFacing(_facing);
}
}
@ -2085,8 +2086,8 @@ namespace Server.Multis
PPlank?.SetFacing(facing);
SPlank?.SetFacing(facing);
var xOffset = X;
var yOffset = Y;
var xOffset = 0;
var yOffset = 0;
Movement.Movement.Offset(facing, ref xOffset, ref yOffset);
var count = ((_facing - old) & 0x7) / 2;
@ -2112,15 +2113,15 @@ namespace Server.Multis
if (TillerMan != null)
{
TillerMan.Location = new Point3D(
xOffset * TillerManDistance + (facing == Direction.North ? 1 : 0),
yOffset * TillerManDistance,
X + xOffset * TillerManDistance + (facing == Direction.North ? 1 : 0),
Y + yOffset * TillerManDistance,
TillerMan.Z
);
}
if (Hold != null)
{
Hold.Location = new Point3D(xOffset * HoldDistance, yOffset * HoldDistance, Hold.Z);
Hold.Location = new Point3D(X + xOffset * HoldDistance, Y + yOffset * HoldDistance, Hold.Z);
}
if (PPlank != null)
@ -2157,6 +2158,15 @@ namespace Server.Multis
{
EventSink.WorldLoad += UpdateAllComponents;
EventSink.WorldSave += UpdateAllComponents;
// Fix tiler/hold/plank locations
foreach (var item in World.Items.Values)
{
if (item is BaseBoat boat)
{
boat.UpdateComponents();
}
}
}
private class TurnTimer : Timer