From b8839e87c8de18bb7ece1c80d41a052b41510f79 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Mon, 25 Jul 2022 23:07:42 +0300
Subject: [PATCH] [Client] Make peace between players who become allies and
 their followers

---
 apps/openmw/mwmp/processors/player/ProcessorPlayerAlly.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerAlly.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerAlly.hpp
index 901e31695..a95462721 100644
--- a/apps/openmw/mwmp/processors/player/ProcessorPlayerAlly.hpp
+++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerAlly.hpp
@@ -4,6 +4,7 @@
 #include "../PlayerProcessor.hpp"
 #include "apps/openmw/mwmp/Main.hpp"
 #include "apps/openmw/mwmp/LocalPlayer.hpp"
+#include "apps/openmw/mwmp/MechanicsHelper.hpp"
 
 namespace mwmp
 {
@@ -30,6 +31,7 @@ namespace mwmp
                     if (dedicatedPlayer)
                     {
                         LOG_APPEND(TimedLog::LOG_INFO, "- Adding DedicatedPlayer %s to our allied players", dedicatedPlayer->npc.mName.c_str());
+                        MechanicsHelper::makePeace(localPlayer->getPlayerPtr(), dedicatedPlayer->getPtr());
                     }
 
                     ++iter;
@@ -52,6 +54,7 @@ namespace mwmp
                         if (otherDedicatedPlayer)
                         {
                             LOG_APPEND(TimedLog::LOG_INFO, "- Adding DedicatedPlayer %s to their allied players", otherDedicatedPlayer->npc.mName.c_str());
+                            MechanicsHelper::makePeace(static_cast<DedicatedPlayer*>(player)->getPtr(), otherDedicatedPlayer->getPtr());
                         }
                     }