muffin v6.15

This commit is contained in:
alydev 2025-10-09 08:41:52 +10:00
parent cb878047bb
commit 29d735e936
16 changed files with 116 additions and 110 deletions

View file

@ -207,7 +207,7 @@ internal sealed class GatheringController : MiniTaskController<GatheringControll
public bool HasNodeDisappeared(GatheringNode node)
{
return !_objectTable.Any((IGameObject x) => x.ObjectKind == ObjectKind.GatheringPoint && x.IsTargetable && x.DataId == node.DataId);
return !_objectTable.Any((IGameObject x) => x.ObjectKind == ObjectKind.GatheringPoint && x.IsTargetable && x.BaseId == node.DataId);
}
private GatheringNode? FindNextTargetableNodeAndUpdateIndex(CurrentRequest currentRequest)
@ -216,7 +216,7 @@ internal sealed class GatheringController : MiniTaskController<GatheringControll
{
int num = (currentRequest.CurrentIndex + i) % currentRequest.Nodes.Count;
GatheringNode currentNode = currentRequest.Nodes[num];
List<IGameObject> source = currentNode.Locations.Select((GatheringLocation x) => _objectTable.FirstOrDefault((IGameObject y) => currentNode.DataId == y.DataId && Vector3.Distance(x.Position, y.Position) < 0.1f)).ToList();
List<IGameObject> source = currentNode.Locations.Select((GatheringLocation x) => _objectTable.FirstOrDefault((IGameObject y) => currentNode.DataId == y.BaseId && Vector3.Distance(x.Position, y.Position) < 0.1f)).ToList();
if (source.Any((IGameObject x) => x == null))
{
currentRequest.CurrentIndex = (num + 1) % currentRequest.Nodes.Count;