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

fix: Removes GetObjectsInRange and fixes boat planks closing (#1579)

Browse source 
## BREAKING CHANGE

- Deletes `map.GetObjectsInRange` and `map.GetObejctsInBounds`

### Notes

Developers are expected to enumerate mobiles and items separately now using `map.GetMobilesInRange` and `map.GetItemsInRange`. This helps keep the code streamlined so we don't have to maintain multiple copies of ref struct enumerators that do the same thing.


### Fixes

- [X] Fixes bug with planks closing
- [X] Fixes issue with iterating items/mobiles from a null map
This commit is contained in:
Kamron Batman 2023-11-03 13:45:18 -07:00 • committed by GitHub
parent cb1638591b
commit 977fdc2c5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 543 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Projects/UOContent.Tests/Tests/Multis/Boats/BoatPacketTests.cs
View file

@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using Server;
using Server.Collections;
using Server.Multis;
using Server.Multis.Boats;
using Server.Network;
@ -37,9 +38,12 @@ public class BoatPacketTests : IClassFixture<ServerFixture>
beholder.Map = Map.Felucca;
beholder.CanSeeEntities.Add(item1);
var list = new List<IEntity> { item1, beholder };
using var list = PooledRefList<IEntity>.Create();
list.Add(beholder);
list.Add(item1);
var notContained = new List<IEntity> { item2 };
var boat = new TestBoat((Serial)0x3000, list, notContained)
var boat = new TestBoat((Serial)0x3000, notContained)
{
Location = new Point3D(10, 20, 15),
Facing = Direction.Right,
@ -52,7 +56,7 @@ public class BoatPacketTests : IClassFixture<ServerFixture>
ns.ProtocolChanges = ProtocolChanges.HighSeas;
var expected = new MoveBoatHS(beholder, boat, d, speed, list, xOffset, yOffset).Compile();
ns.SendMoveBoatHS(beholder, boat, d, speed, boat.GetMovingEntities(true), xOffset, yOffset);
ns.SendMoveBoatHS(boat, list, d, speed, xOffset, yOffset);
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
@ -77,15 +81,16 @@ public class BoatPacketTests : IClassFixture<ServerFixture>
var beholder = new MockedMobile((Serial)0x100);
beholder.DefaultMobileInit();
beholder.Location = new Point3D(10, 20, 15);
beholder.Map = Map.Felucca;
beholder.CanSeeEntities.Add(item1);
var list = new List<IEntity> { item1, beholder };
var notContained = new List<IEntity> { item2 };
var boat = new TestBoat((Serial)0x3000, list, notContained)
var boat = new TestBoat((Serial)0x3000, notContained)
{
Location = new Point3D(10, 20, 15),
Facing = Direction.Right
Facing = Direction.Right,
Map = Map.Felucca
};
beholder.CanSeeEntities.Add(boat);
@ -103,21 +108,16 @@ public class BoatPacketTests : IClassFixture<ServerFixture>
private class TestBoat : BaseBoat
{
private readonly List<IEntity> _list;
private readonly List<IEntity> _notContainedList;
public TestBoat(Serial serial, List<IEntity> list, List<IEntity> notContainedList) : base(serial)
{
_list = list;
_notContainedList = notContainedList;
}
public TestBoat(Serial serial, List<IEntity> notContainedList) : base(serial) => _notContainedList = notContainedList;
public override MultiComponentList Components { get; } = new(new List<MultiTileEntry>());
public override bool Contains(int x, int y) => !_notContainedList.Any(e => e.X == x && e.Y == y);
public override MovingEntitiesEnumerable GetMovingEntities(bool includeBoat = false) =>
new(this, true, new PooledEnumeration.PooledEnumerable<IEntity>(_list));
new(this, true, new Rectangle2D(new Point2D(9, 19), new Point2D(13, 22)));
}
private class MockedMobile : Mobile

8
Projects/UOContent.Tests/Tests/Multis/Boats/Packets.cs
View file

@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.IO;
using Server;
using Server.Collections;
using Server.Items;
using Server.Multis;
using Server.Network;
@ -11,7 +12,7 @@ namespace UOContent.Tests
{
public MoveBoatHS(
Mobile beholder, BaseBoat boat, Direction d,
int speed, List<IEntity> ents, int xOffset,
int speed, PooledRefList<IEntity> ents, int xOffset,
int yOffset
) : base(0xF6)
{
@ -30,11 +31,6 @@ namespace UOContent.Tests
foreach (var ent in ents)
{
if (!beholder.CanSee(ent))
{
continue;
}
Stream.Write(ent.Serial);
Stream.Write((short)(ent.X + xOffset));
Stream.Write((short)(ent.Y + yOffset));