Merge branch 'azerothcore:master' into Playerbot

2022-06-08 11:10:38 -06:00
parent 427f0afaaf c0ab2ab08e
commit d8a2665867
32 changed files with 2341 additions and 744 deletions
@@ -386,6 +386,8 @@ public:

    void ModifyThreatPercentTemp(Unit* victim, int32 percent, Milliseconds duration);

+    void ResetFaction() { SetFaction(GetCreatureTemplate()->faction); }
+
 protected:
    bool CreateFromProto(ObjectGuid::LowType guidlow, uint32 Entry, uint32 vehId, const CreatureData* data = nullptr);
    bool InitEntry(uint32 entry, const CreatureData* data = nullptr);