Party Error Correction

Bannerlord-Coop-Team · Nov 29, 2023 · aac793c · aac793c
1 parent dccf165
commit aac793c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/source/GameInterface/Services/MobileParties/Data/PartyBehaviorUpdateData.cs b/source/GameInterface/Services/MobileParties/Data/PartyBehaviorUpdateData.cs
@@ -30,14 +30,22 @@ public record PartyBehaviorUpdateData
         [ProtoMember(6)]
         public float TargetPointY { get; }
 
-        public PartyBehaviorUpdateData(string partyId, AiBehavior aiBehavior, bool hasTarget, string targetId, Vec2 targetPoint)
+        [ProtoMember(7)]
+        public float PartyPositionX { get; }
+
+        [ProtoMember(8)]
+        public float PartyPositionY { get; }
+
+        public PartyBehaviorUpdateData(string partyId, AiBehavior aiBehavior, bool hasTarget, string targetId, Vec2 targetPoint, Vec2 partyPosition)
         {
             PartyId = partyId;
             Behavior = aiBehavior;
             HasTarget = hasTarget;
             TargetId = targetId;
             TargetPointX = targetPoint.X;
             TargetPointY = targetPoint.Y;
+            PartyPositionX = partyPosition.X;
+            PartyPositionY = partyPosition.Y;
         }
     }
 }
diff --git a/source/GameInterface/Services/MobileParties/Handlers/MobilePartyBehaviorHandler.cs b/source/GameInterface/Services/MobileParties/Handlers/MobilePartyBehaviorHandler.cs
@@ -78,6 +78,8 @@ public void Handle_UpdatePartyBehavior(MessagePayload<UpdatePartyBehavior> obj)
 
         Vec2 targetPoint = new Vec2(data.TargetPointX, data.TargetPointY);
 
+        party.Position2D = new Vec2(data.PartyPositionX, data.PartyPositionY);
+
         PartyBehaviorPatch.SetAiBehavior(
             party.Ai,
             data.Behavior,

diff --git a/source/GameInterface/Services/MobileParties/Patches/PartyBehaviorPatch.cs b/source/GameInterface/Services/MobileParties/Patches/PartyBehaviorPatch.cs
@@ -62,7 +62,7 @@ private static bool SetAiBehaviorPrefix(
                 : targetPartyFigure.MobileParty.StringId;
         }
 
-        var data = new PartyBehaviorUpdateData(party.StringId, newAiBehavior, hasTargetEntity, targetEntityId, bestTargetPoint);
+        var data = new PartyBehaviorUpdateData(party.StringId, newAiBehavior, hasTargetEntity, targetEntityId, bestTargetPoint, party.Position2D);
         var message = new PartyBehaviorChangeAttempted(party, data);
         MessageBroker.Instance.Publish(__instance, message);