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

fix: Fixes drydocking when EffectItem type items are on the deck (#1416)

Browse source
This commit is contained in:
vexyl 2023-06-27 21:12:58 -04:00 • committed by GitHub
parent db4b01567f
commit d99e72db8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using Server.Engines.Spawners;
using Server.Items; using Server.Items;
using Server.Multis.Boats; using Server.Multis.Boats;
@ -1812,10 +1813,8 @@ namespace Server.Multis
{ {
item.NoMoveHS = true; item.NoMoveHS = true;
if (!(item is Server.Items.TillerMan or Server.Items.Hold or Plank)) // Already filtered for Tiller/Hold/Plank/EffectItem
{ item.Location = new Point3D(item.X + xOffset, item.Y + yOffset, item.Z);
item.Location = new Point3D(item.X + xOffset, item.Y + yOffset, item.Z);
}
} }
else if (e is Mobile m) else if (e is Mobile m)
{ {
@ -1936,32 +1935,26 @@ namespace Server.Multis
{ {
current = _enumerator.Current; current = _enumerator.Current;
if (!_includeBoat && current is Server.Items.TillerMan or Server.Items.Hold or Plank) // Skip the boat, effects, spawners, or parts of the boat
if (current == _boat || current is EffectItem or BaseSpawner ||
!_includeBoat && current is Server.Items.TillerMan or Server.Items.Hold or Plank)
{ {
continue; continue;
} }
if (current is Item item) if (current is Item item)
{ {
if (item == _boat)
{
continue;
}
// TODO: Remove visible check and use something better, like check for spawners, or other things in the ocean we shouldn't pick up on accident // TODO: Remove visible check and use something better, like check for spawners, or other things in the ocean we shouldn't pick up on accident
if (_boat.Contains(item) && item.Visible && item.Z >= _boat.Z) if (_boat!.Contains(item) && item.Visible && item.Z >= _boat.Z)
{ {
_current = current; _current = current;
return true; return true;
} }
} }
else if (current is Mobile m) else if (current is Mobile m && _boat!.Contains(m))
{ {
if (_boat.Contains(m)) _current = current;
{ return true;
_current = current;
return true;
}
} }
} }