From eeb3e4f9381dccb9d82786acc88e3ee8e36d6e81 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Mon, 2 Dec 2019 23:29:36 +0200
Subject: [PATCH] [Client] Reset friendly hits when summoning a creature

---
 apps/openmw/mwmechanics/creaturestats.cpp | 13 +++++++++++++
 apps/openmw/mwmechanics/creaturestats.hpp | 10 ++++++++++
 apps/openmw/mwmp/ObjectList.cpp           |  2 ++
 3 files changed, 25 insertions(+)

diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 535042740..758c07a65 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -357,6 +357,19 @@ namespace MWMechanics
         return mFriendlyHits;
     }
 
+    /*
+        Start of tes3mp addition
+
+        Make it possible to set the number of friendly hits from elsewhere
+    */
+    void CreatureStats::setFriendlyHits(int hits)
+    {
+        mFriendlyHits = hits;
+    }
+    /*
+        End of tes3mp addition
+    */
+
     void CreatureStats::friendlyHit()
     {
         ++mFriendlyHits;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 7e9785d22..50b984567 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -212,6 +212,16 @@ namespace MWMechanics
         int getFriendlyHits() const;
         ///< Number of friendly hits received.
 
+        /*
+            Start of tes3mp addition
+
+            Make it possible to set the number of friendly hits from elsewhere
+        */
+        void setFriendlyHits(int hits);
+        /*
+            End of tes3mp addition
+        */
+
         void friendlyHit();
         ///< Increase number of friendly hits by one.
 
diff --git a/apps/openmw/mwmp/ObjectList.cpp b/apps/openmw/mwmp/ObjectList.cpp
index 1542e634f..96b104f1e 100644
--- a/apps/openmw/mwmp/ObjectList.cpp
+++ b/apps/openmw/mwmp/ObjectList.cpp
@@ -477,6 +477,8 @@ void ObjectList::spawnObjects(MWWorld::CellStore* cellStore)
                     // If not, add it to the summoned creature map
                     else
                         creatureMap.insert(std::make_pair(std::make_pair(baseObject.summonEffectId, baseObject.summonSpellId), creatureActorId));
+
+                    creatureStats.setFriendlyHits(0);
                 }
             }
         }